diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 0b4fe88c2d4..95ba43d9d14 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -10,7 +10,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 5.15.125.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog +* Thu Aug 10 2023 Rachel Menge - 5.15.125.1-2 +- Bump release to match kernel + * Wed Aug 09 2023 CBL-Mariner Servicing Account - 5.15.125.1-1 - Auto-upgrade to 5.15.125.1 diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 56a9df0ab65..afca691f13f 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,7 +1,7 @@ Summary: Linux API header files Name: kernel-headers Version: 5.15.125.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -36,6 +36,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Thu Aug 10 2023 Rachel Menge - 5.15.125.1-2 +- Bump release to match kernel + * Wed Aug 09 2023 CBL-Mariner Servicing Account - 5.15.125.1-1 - Auto-upgrade to 5.15.125.1 diff --git a/SPECS/kernel/config b/SPECS/kernel/config index c22f205572f..592895780e3 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -2003,7 +2003,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_DRBD is not set -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index dfb66fb6e16..474ad6dcfda 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", - "config": "56ecd1e814e91f37420c65f3fe6aa06a8f0204ace2af6162f452f932077a9d57", + "config": "31675ad04227508329fa2ab00ea1ab43758262421992c0d6ca779ceb411c0a69", "config_aarch64": "76ed18b4af628e76db14b8a1e024bbfa59768fb3fece2cf7830ede304ca15bb9", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", "kernel-5.15.125.1.tar.gz": "f97197bae4b4b10bbb917e406175e9b52330f35b32f0e748586eb622708759e7" diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index bf113540508..30302bb3cdc 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -28,7 +28,7 @@ Summary: Linux Kernel Name: kernel Version: 5.15.125.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -422,6 +422,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Thu Aug 10 2023 Rachel Menge - 5.15.125.1-2 +- Enable CONFIG_BLK_DEV_NBD module + * Wed Aug 09 2023 CBL-Mariner Servicing Account - 5.15.125.1-1 - Auto-upgrade to 5.15.125.1 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 565ee4f2f63..3bdd5fe02cc 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-15.cm2.aarch64.rpm -kernel-headers-5.15.125.1-1.cm2.noarch.rpm +kernel-headers-5.15.125.1-2.cm2.noarch.rpm glibc-2.35-4.cm2.aarch64.rpm glibc-devel-2.35-4.cm2.aarch64.rpm glibc-i18n-2.35-4.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index b84b8ecf5dd..ebed029f624 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-15.cm2.x86_64.rpm -kernel-headers-5.15.125.1-1.cm2.noarch.rpm +kernel-headers-5.15.125.1-2.cm2.noarch.rpm glibc-2.35-4.cm2.x86_64.rpm glibc-devel-2.35-4.cm2.x86_64.rpm glibc-i18n-2.35-4.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index b24653967f3..b4bf4c3ee48 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -136,7 +136,7 @@ intltool-0.51.0-7.cm2.noarch.rpm itstool-2.0.6-4.cm2.noarch.rpm kbd-2.2.0-1.cm2.aarch64.rpm kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm -kernel-headers-5.15.125.1-1.cm2.noarch.rpm +kernel-headers-5.15.125.1-2.cm2.noarch.rpm kmod-29-1.cm2.aarch64.rpm kmod-debuginfo-29-1.cm2.aarch64.rpm kmod-devel-29-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 97e0efd6ae3..512e679ab23 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -136,7 +136,7 @@ intltool-0.51.0-7.cm2.noarch.rpm itstool-2.0.6-4.cm2.noarch.rpm kbd-2.2.0-1.cm2.x86_64.rpm kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm -kernel-headers-5.15.125.1-1.cm2.noarch.rpm +kernel-headers-5.15.125.1-2.cm2.noarch.rpm kmod-29-1.cm2.x86_64.rpm kmod-debuginfo-29-1.cm2.x86_64.rpm kmod-devel-29-1.cm2.x86_64.rpm diff --git a/toolkit/scripts/mariner-required-configs.json b/toolkit/scripts/mariner-required-configs.json index d9497858ce0..81a06425435 100644 --- a/toolkit/scripts/mariner-required-configs.json +++ b/toolkit/scripts/mariner-required-configs.json @@ -1088,6 +1088,19 @@ "PR": [ "https://github.com/microsoft/CBL-Mariner/pull/5964" ] + }, + "CONFIG_BLK_DEV_NBD": { + "value": [ + "m" + ], + "arch": [ + "AMD64", + "ARM64" + ], + "comment": "Add nbd module for customer", + "PR": [ + "https://github.com/microsoft/CBL-Mariner/pull/5972" + ] } } } diff --git a/toolkit/scripts/tools.mk b/toolkit/scripts/tools.mk index 9a9c6d8ace2..352767f5910 100644 --- a/toolkit/scripts/tools.mk +++ b/toolkit/scripts/tools.mk @@ -13,6 +13,21 @@ $(call create_folder,$(BUILD_DIR)/tools) ######## GO TOOLS ######## +# The version as held in the go.mod file (a line like 'go 1.19'). Add "go" to the front of the version number +# so that it matches the output of 'go version' (e.g. 'go1.19'). +go_min_version = go$(shell grep -E '^go [0-9]+\.[0-9]+' $(TOOLS_DIR)/go.mod | awk '{print $$2}') + +# Check if the go version is high enough to build the tools. The 'sort' command is used to compare the versions +# (with -V which sorts by version number). If the lowest version in the sort is the same as the minimum version, then +# the installed version must be greater than or equal to the minimum version and we are fine. +ifeq ($(REBUILD_TOOLS),y) +go_current_version = $(shell go version | awk '{print $$3}') +go_version_check = $(shell printf '%s\n%s\n' "$(go_min_version)" "$(go_current_version)" | sort -V | head -n1) +ifneq ($(go_version_check),$(go_min_version)) +$(error Go version '$(go_current_version)' is less than minimum required version '$(go_min_version)') +endif +endif + # List of go utilities in tools/ directory go_tool_list = \ boilerplate \