summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/build-flavors/dell-vep1400.toml2
-rw-r--r--data/build-flavors/dell-vep4600.toml2
-rw-r--r--data/build-flavors/xcpng.toml2
-rw-r--r--data/defaults.toml2
-rwxr-xr-xpackages/linux-kernel/build-mellanox-ofed.sh7
5 files changed, 8 insertions, 7 deletions
diff --git a/data/build-flavors/dell-vep1400.toml b/data/build-flavors/dell-vep1400.toml
index 8ce3d8b6..038cbe24 100644
--- a/data/build-flavors/dell-vep1400.toml
+++ b/data/build-flavors/dell-vep1400.toml
@@ -1,6 +1,6 @@
# ISO image for Dell VEP4600 devices
-image_formats = "iso"
+image_format = "iso"
# Replace built-in NIC naming rules with empty files
# to prevent them from taking any effect
diff --git a/data/build-flavors/dell-vep4600.toml b/data/build-flavors/dell-vep4600.toml
index 97256b41..50fdb4d2 100644
--- a/data/build-flavors/dell-vep4600.toml
+++ b/data/build-flavors/dell-vep4600.toml
@@ -1,6 +1,6 @@
# ISO image for Dell VEP4600 devices
-image_formats = "iso"
+image_format = "iso"
# Replace built-in NIC naming rules with empty files
# to prevent them from taking any effect
diff --git a/data/build-flavors/xcpng.toml b/data/build-flavors/xcpng.toml
index 81689b5e..3a04177f 100644
--- a/data/build-flavors/xcpng.toml
+++ b/data/build-flavors/xcpng.toml
@@ -1,6 +1,6 @@
# Installation ISO for the XCP-ng virtualization platform
-image_formats = "iso"
+image_format = "iso"
# Include these packages in the image
packages = ["xe-guest-utilities"]
diff --git a/data/defaults.toml b/data/defaults.toml
index 5f02e895..47eab15f 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current"
vyos_branch = "current"
release_train = "current"
-kernel_version = "6.6.45"
+kernel_version = "6.6.47"
bootloaders = "syslinux,grub-efi"
squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery"
diff --git a/packages/linux-kernel/build-mellanox-ofed.sh b/packages/linux-kernel/build-mellanox-ofed.sh
index 0dffcfdb..51e4d4ca 100755
--- a/packages/linux-kernel/build-mellanox-ofed.sh
+++ b/packages/linux-kernel/build-mellanox-ofed.sh
@@ -16,12 +16,13 @@ fi
. ${KERNEL_VAR_FILE}
-url="https://www.mellanox.com/downloads/ofed/MLNX_OFED-24.04-0.6.6.0/MLNX_OFED_SRC-debian-24.04-0.6.6.0.tgz"
+mlxver="24.07-0.6.1.0"
+url="https://www.mellanox.com/downloads/ofed/MLNX_OFED-${mlxver}/MLNX_OFED_SRC-debian-${mlxver}.tgz"
cd ${CWD}
DRIVER_FILE=$(basename ${url} | sed -e s/tar_0/tar/)
-DRIVER_SHA1="003c1c022f9f6558d45750eacc0a64d06cf9cd42"
+DRIVER_SHA1="c64defa8fb38dcbce153adc09834ab5cdcecd791"
DRIVER_DIR="${DRIVER_FILE%.tgz}"
DRIVER_NAME="ofed"
@@ -46,7 +47,7 @@ fi
# Verify integrity
echo "${DRIVER_SHA1} ${DRIVER_FILE}" | sha1sum -c -
-if [[ $? != 0 ]]; then
+if [ $? != 0 ]; then
echo SHA1 checksum missmatch
exit 1
fi