Kernel: T3218: drop dependency on Intel out-of-tree modules

3 files changed, 13 insertions, 116 deletions

diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile
index 730ae41d..b72e02dd 100644
--- a/packages/linux-kernel/Jenkinsfile
+++ b/packages/linux-kernel/Jenkinsfile
@@ -221,22 +221,6 @@ pipeline {
                         }
                     }
                 }
-                stage('Intel Driver(s)') {
-                    when {
-                        beforeOptions true
-                        beforeAgent true
-                        anyOf {
-                            changeset pattern: "${env.CHANGESET_DIR}"
-                            triggeredBy 'TimerTrigger'
-                            triggeredBy cause: "UserIdCause"
-                        }
-                    }
-                    steps {
-                        dir(env.BASE_DIR) {
-                            sh "./build-intel-drivers.sh"
-                        }
-                    }
-                }
                 stage('Intel QuickAssist Technology') {
                     when {
                         beforeOptions true
@@ -257,7 +241,7 @@ pipeline {
         }
         // This stage should not be run in the parallel section as it will call "make"
         // again on the kernel source and this could confuse other build systems
-        // like generating Intel or Accel-PPP drivers. Better safe then sorry!
+        // like Accel-PPP. Better safe then sorry!
         stage('Linux Firmware') {
             when {
                 beforeOptions true
diff --git a/packages/linux-kernel/build-intel-drivers.sh b/packages/linux-kernel/build-intel-drivers.sh
deleted file mode 100755
index 6ce9e6b8..00000000
--- a/packages/linux-kernel/build-intel-drivers.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-CWD=$(pwd)
-KERNEL_VAR_FILE=${CWD}/kernel-vars
-
-if [ ! -f ${KERNEL_VAR_FILE} ]; then
-    echo "Kernel variable file '${KERNEL_VAR_FILE}' does not exist, run ./build_kernel.sh first"
-    exit 1
-fi
-
-. ${KERNEL_VAR_FILE}
-
-declare -a intel=(
-    "http://dev.packages.vyos.net/source-mirror/ixgbe-5.9.4.tar.gz"
-    "http://dev.packages.vyos.net/source-mirror/ixgbevf-4.9.3.tar.gz"
-    "http://dev.packages.vyos.net/source-mirror/igb-5.4.6.tar.gz"
-    "http://dev.packages.vyos.net/source-mirror/i40e-2.13.10.tar.gz"
-    "http://dev.packages.vyos.net/source-mirror/iavf-4.0.1.tar.gz"
-)
-
-for url in "${intel[@]}"
-do
-    cd ${CWD}
-
-    DRIVER_FILE="$(basename ${url})"
-    DRIVER_DIR="${DRIVER_FILE%.tar.gz}"
-    DRIVER_NAME="${DRIVER_DIR%-*}"
-    DRIVER_VERSION="${DRIVER_DIR##*-}"
-    DRIVER_VERSION_EXTRA="-0"
-
-    # Build up Debian related variables required for packaging
-    DEBIAN_ARCH=$(dpkg --print-architecture)
-    DEBIAN_DIR="${CWD}/vyos-intel-${DRIVER_NAME}_${DRIVER_VERSION}${DRIVER_VERSION_EXTRA}_${DEBIAN_ARCH}"
-    DEBIAN_CONTROL="${DEBIAN_DIR}/DEBIAN/control"
-    DEBIAN_POSTINST="${CWD}/vyos-intel-driver.postinst"
-
-    # Fetch Intel driver source from SourceForge
-    if [ -e ${DRIVER_FILE} ]; then
-        rm -f ${DRIVER_FILE}
-    fi
-    curl -L -o ${DRIVER_FILE} ${url}
-    if [ "$?" -ne "0" ]; then
-        exit 1
-    fi
-
-    # Unpack archive
-    if [ -d ${DRIVER_DIR} ]; then
-        rm -rf ${DRIVER_DIR}
-    fi
-    tar xf ${DRIVER_FILE}
-
-    cd ${DRIVER_DIR}/src
-    if [ -z $KERNEL_DIR ]; then
-        echo "KERNEL_DIR not defined"
-        exit 1
-    fi
-    echo "I: Compile Kernel module for Intel ${DRIVER_NAME} driver"
-    KSRC=${KERNEL_DIR} \
-        INSTALL_MOD_PATH=${DEBIAN_DIR} \
-        make -j $(getconf _NPROCESSORS_ONLN) install
-
-    # delete non required files which are also present in the kernel package
-    # und thus lead to duplicated files
-    find ${DEBIAN_DIR} -name "modules.*" | xargs rm -f
-
-    echo "#!/bin/sh" > ${DEBIAN_POSTINST}
-    echo "/sbin/depmod -a ${KERNEL_VERSION}${KERNEL_SUFFIX}" >> ${DEBIAN_POSTINST}
-
-    # build Debian package
-    echo "I: Building Debian package vyos-intel-${DRIVER_NAME}"
-    cd ${CWD}
-    if [ -f ${DEBIAN_DIR}.deb ]; then
-        rm ${DEBIAN_DIR}.deb
-    fi
-    fpm --input-type dir --output-type deb --name vyos-intel-${DRIVER_NAME} \
-        --version ${DRIVER_VERSION}${DRIVER_VERSION_EXTRA} --deb-compression gz \
-        --maintainer "VyOS Package Maintainers <maintainers@vyos.net>" \
-        --description "Vendor based driver for Intel ${DRIVER_NAME} NIC" \
-	--depends linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX} \
-	--license "GPL2" \
-        -C ${DEBIAN_DIR} --after-install ${DEBIAN_POSTINST}
-
-    echo "I: Cleanup ${DRIVER_NAME} source"
-    cd ${CWD}
-    if [ -e ${DRIVER_FILE} ]; then
-        rm -f ${DRIVER_FILE}
-    fi
-    if [ -d ${DRIVER_DIR} ]; then
-        rm -rf ${DRIVER_DIR}
-    fi
-    if [ -d ${DEBIAN_DIR} ]; then
-        rm -rf ${DEBIAN_DIR}
-    fi
-done
diff --git a/packages/linux-kernel/x86_64_vyos_defconfig b/packages/linux-kernel/x86_64_vyos_defconfig
index 1c25f3ef..73452efb 100644
--- a/packages/linux-kernel/x86_64_vyos_defconfig
+++ b/packages/linux-kernel/x86_64_vyos_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.83 Kernel Configuration
+# Linux/x86 5.4.88 Kernel Configuration
 #
 
 #
@@ -2310,17 +2310,23 @@ CONFIG_E100=m
 CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_E1000E_HWTS=y
-# CONFIG_IGB is not set
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
-# CONFIG_IXGBE is not set
-# CONFIG_IXGBEVF is not set
-# CONFIG_I40E is not set
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
 CONFIG_IAVF=m
 CONFIG_I40EVF=m
 CONFIG_ICE=m
 # CONFIG_FM10K is not set
-# CONFIG_IGC is not set
+CONFIG_IGC=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 # CONFIG_MVMDIO is not set