diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-11-05 22:29:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-11-05 22:29:22 +0100 |
| commit | d167fb685d62f29c8c9a5596c8d8689238f10a1b (patch) | |
| tree | 173acaa6b4cb12990ae6e5937dd66d3e333945ae /scripts | |
| parent | c96465c1d6c39f6803ff7307e104d0f4004cd2dd (diff) | |
| parent | 95fcbdda9a28e820f217b98c7173fe1719d16688 (diff) | |
| download | vyos-build-d167fb685d62f29c8c9a5596c8d8689238f10a1b.tar.gz vyos-build-d167fb685d62f29c8c9a5596c8d8689238f10a1b.zip | |
Merge pull request #1344 from c-po/T9577-intel-nic-pins
Kernel: T9577: Intel NIC drivers must honour commit_id from package.toml
Diffstat (limited to 'scripts')
5 files changed, 11 insertions, 8 deletions
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-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 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/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" 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 |
