From 2af969a368d8712f0c084078c6315a6bd81ee00f Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 5 Nov 2026 17:23:59 +0000 Subject: Kernel: T9577: Intel NIC drivers must honour commit_id from package.toml The Intel out-of-tree driver build reset each source tree to origin/main after the pinned commit_id had been checked out. Every driver was built from whatever was on Intel's main branch, so the pins had no effect and builds were not reproducible. The tree is now reset to the checked-out commit, which still drops leftover patches from a previous run but keeps the pinned release. --- scripts/package-build/linux-kernel/build-intel-nic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/package-build/linux-kernel/build-intel-nic.sh b/scripts/package-build/linux-kernel/build-intel-nic.sh index 540694a3..7d152826 100755 --- a/scripts/package-build/linux-kernel/build-intel-nic.sh +++ b/scripts/package-build/linux-kernel/build-intel-nic.sh @@ -21,8 +21,8 @@ fi DRIVER_NAME=$1 cd ${CWD}/ethernet-linux-${DRIVER_NAME} if [ -d .git ]; then + git reset --hard HEAD git clean --force -d -x - git reset --hard origin/main fi # See https://vyos.dev/T6155 -- cgit v1.2.3 From 73f6ea2050b062f08737651980159f763d249e71 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 5 Nov 2026 17:24:03 +0000 Subject: Kernel: T9577: bump Intel out-of-tree NIC drivers to latest releases Now that the pins are honoured, move them to the current upstream releases so images do not fall back to older drivers than they ship today: - igb 5.20.93 - ixgbe 6.5.9 - ixgbevf 5.3.87 - i40e 2.30.83 - ice 2.7.6 - iavf 4.13.78 --- scripts/package-build/linux-kernel/package.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/package-build/linux-kernel/package.toml b/scripts/package-build/linux-kernel/package.toml index 5bbf8df1..b13d9d86 100644 --- a/scripts/package-build/linux-kernel/package.toml +++ b/scripts/package-build/linux-kernel/package.toml @@ -36,37 +36,37 @@ build_cmd = "build_intel_qat" [[packages]] name = "igb" -commit_id = "v5.20.28" +commit_id = "v5.20.93" scm_url = "https://github.com/intel/ethernet-linux-igb" build_cmd = "build_intel_nic" [[packages]] name = "ixgbe" -commit_id = "v6.4.5" +commit_id = "v6.5.9" scm_url = "https://github.com/intel/ethernet-linux-ixgbe" build_cmd = "build_intel_nic" [[packages]] name = "ixgbevf" -commit_id = "v5.3.36" +commit_id = "v5.3.87" scm_url = "http://github.com/intel/ethernet-linux-ixgbevf" build_cmd = "build_intel_nic" [[packages]] name = "i40e" -commit_id = "v2.30.18" +commit_id = "v2.30.83" scm_url = "http://github.com/intel/ethernet-linux-i40e" build_cmd = "build_intel_nic" [[packages]] name = "ice" -commit_id = "v2.6.7" +commit_id = "v2.7.6" scm_url = "http://github.com/intel/ethernet-linux-ice" build_cmd = "build_intel_nic" [[packages]] name = "iavf" -commit_id = "v4.13.35" +commit_id = "v4.13.78" scm_url = "http://github.com/intel/ethernet-linux-iavf" build_cmd = "build_intel_nic" -- cgit v1.2.3 From 95fcbdda9a28e820f217b98c7173fe1719d16688 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 5 Nov 2026 17:27:50 +0000 Subject: Kernel: T9577: abort out-of-tree module builds on the first error Several build helpers kept going after a failing command, so a broken patch, compile or signing step could still produce a package and the calling build reported success. Unsigned modules could end up in an image this way. These helpers now stop at the first error. The Mellanox OFED build also exits non-zero when not run as root instead of silently succeeding. --- scripts/package-build/linux-kernel/build-accel-ppp-ng.sh | 1 + scripts/package-build/linux-kernel/build-mellanox-ofed.sh | 3 ++- scripts/package-build/linux-kernel/sign-modules.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/package-build/linux-kernel/build-accel-ppp-ng.sh b/scripts/package-build/linux-kernel/build-accel-ppp-ng.sh index 6e62d879..fbf22707 100755 --- a/scripts/package-build/linux-kernel/build-accel-ppp-ng.sh +++ b/scripts/package-build/linux-kernel/build-accel-ppp-ng.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e ARCH_TRIPLET=$(dpkg-architecture -qDEB_HOST_MULTIARCH) CWD=$(pwd) diff --git a/scripts/package-build/linux-kernel/build-mellanox-ofed.sh b/scripts/package-build/linux-kernel/build-mellanox-ofed.sh index 76c1bd03..a8ba13e7 100755 --- a/scripts/package-build/linux-kernel/build-mellanox-ofed.sh +++ b/scripts/package-build/linux-kernel/build-mellanox-ofed.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e DROP_DEV_DBG_DEBS=1 DEB_DISTRO='debian12.1' CWD=$(pwd) @@ -7,7 +8,7 @@ KERNEL_VAR_FILE=${CWD}/kernel-vars if [ $(id -u) -ne 0 ]; then echo "Mellanox OFED script needs to be run as root" - exit + exit 1 fi require_amd64 "Mellanox OFED" diff --git a/scripts/package-build/linux-kernel/sign-modules.sh b/scripts/package-build/linux-kernel/sign-modules.sh index d1d822cb..90cad13a 100755 --- a/scripts/package-build/linux-kernel/sign-modules.sh +++ b/scripts/package-build/linux-kernel/sign-modules.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e BASE_DIR=$(dirname $0) MODULE_DIR=$1 -- cgit v1.2.3