Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTOPATCHER-kernel] Kernel upgrade to version 6.6.71.1 - branch 3.0-dev #12163

Open
wants to merge 3 commits into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
%define uname_r %{version}-%{release}
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-64k-signed-%{buildarch}
Version: 6.6.64.2
Release: 4%{?dist}
Version: 6.6.71.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld

%changelog
* Thu Jan 30 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.71.1-1
- Auto-upgrade to 6.6.71.1

* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
- Bump release to match kernel-64k

Expand Down
7 changes: 5 additions & 2 deletions SPECS-SIGNED/kernel-signed/kernel-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
%define uname_r %{version}-%{release}
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 6.6.64.2
Release: 4%{?dist}
Version: 6.6.71.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld

%changelog
* Thu Jan 30 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.71.1-1
- Auto-upgrade to 6.6.71.1

* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
- Bump release to match kernel

Expand Down
7 changes: 5 additions & 2 deletions SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
%define kernelver %{version}-%{release}
Summary: Signed Unified Kernel Image for %{buildarch} systems
Name: kernel-uki-signed-%{buildarch}
Version: 6.6.64.2
Release: 4%{?dist}
Version: 6.6.71.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -68,6 +68,9 @@ popd
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi

%changelog
* Thu Jan 30 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.71.1-1
- Auto-upgrade to 6.6.71.1

* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
- Bump release to match kernel

Expand Down
2 changes: 1 addition & 1 deletion SPECS/hyperv-daemons/hyperv-daemons.signatures.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"hypervkvpd.service": "c1bb207cf9f388f8f3cf5b649abbf8cfe4c4fcf74538612946e68f350d1f265f",
"hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1",
"hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d",
"kernel-6.6.64.2.tar.gz": "8b19b1d4db4add880154d1bf563625efc1b5f52e20792fc6e2628d63b74eb393"
"kernel-6.6.71.1.tar.gz": "63c88a9019dade77ee4414c9b3b0a968c04eaff28a4301b2ac2768dd5d979320"
}
}
5 changes: 4 additions & 1 deletion SPECS/hyperv-daemons/hyperv-daemons.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Summary: Hyper-V daemons suite
Name: hyperv-daemons
Version: 6.6.64.2
Version: 6.6.71.1
Release: 1%{?dist}
License: GPLv2+
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -221,6 +221,9 @@ fi
%{_sbindir}/lsvmbus

%changelog
* Thu Jan 30 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.71.1-1
- Auto-upgrade to 6.6.71.1

* Thu Jan 09 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.64.2-1
- Auto-upgrade to 6.6.64.2

Expand Down
3 changes: 2 additions & 1 deletion SPECS/kernel-64k/config_aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.6.64.2 Kernel Configuration
# Linux/arm64 6.6.71.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2623,6 +2623,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
# CONFIG_ZRAM_DEF_COMP_LZO is not set
CONFIG_ZRAM_DEF_COMP="lzo-rle"
CONFIG_ZRAM_WRITEBACK=y
CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
CONFIG_ZRAM_MEMORY_TRACKING=y
# CONFIG_ZRAM_MULTI_COMP is not set
CONFIG_BLK_DEV_LOOP=y
Expand Down
4 changes: 2 additions & 2 deletions SPECS/kernel-64k/kernel-64k.signatures.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Signatures": {
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
"config_aarch64": "dc7727f4d1b35ec323bc80aadeeba093a92bd45627093c4db49b500b14675add",
"config_aarch64": "814c6ff2d8464208b8c2bb58b846e03a55e9ea7977666a7f8bfba3389d551e2a",
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-6.6.64.2.tar.gz": "8b19b1d4db4add880154d1bf563625efc1b5f52e20792fc6e2628d63b74eb393"
"kernel-6.6.71.1.tar.gz": "63c88a9019dade77ee4414c9b3b0a968c04eaff28a4301b2ac2768dd5d979320"
}
}
7 changes: 5 additions & 2 deletions SPECS/kernel-64k/kernel-64k.spec
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

Summary: Linux Kernel
Name: kernel-64k
Version: 6.6.64.2
Release: 4%{?dist}
Version: 6.6.71.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -370,6 +370,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Thu Jan 30 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.71.1-1
- Auto-upgrade to 6.6.71.1

* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
- Build PCI_HYPERV as builtin

Expand Down
2 changes: 1 addition & 1 deletion SPECS/kernel-headers/kernel-headers.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"kernel-6.6.64.2.tar.gz": "8b19b1d4db4add880154d1bf563625efc1b5f52e20792fc6e2628d63b74eb393"
"kernel-6.6.71.1.tar.gz": "63c88a9019dade77ee4414c9b3b0a968c04eaff28a4301b2ac2768dd5d979320"
}
}
7 changes: 5 additions & 2 deletions SPECS/kernel-headers/kernel-headers.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

Summary: Linux API header files
Name: kernel-headers
Version: 6.6.64.2
Release: 4%{?dist}
Version: 6.6.71.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -75,6 +75,9 @@ done
%endif

%changelog
* Thu Jan 30 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.71.1-1
- Auto-upgrade to 6.6.71.1

* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
- Bump release to match kernel

Expand Down
3 changes: 2 additions & 1 deletion SPECS/kernel/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 6.6.64.2 Kernel Configuration
# Linux/x86_64 6.6.71.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2113,6 +2113,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
# CONFIG_ZRAM_DEF_COMP_LZO is not set
CONFIG_ZRAM_DEF_COMP="lzo-rle"
# CONFIG_ZRAM_WRITEBACK is not set
# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set
# CONFIG_ZRAM_MEMORY_TRACKING is not set
# CONFIG_ZRAM_MULTI_COMP is not set
CONFIG_BLK_DEV_LOOP=y
Expand Down
3 changes: 2 additions & 1 deletion SPECS/kernel/config_aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.6.64.2 Kernel Configuration
# Linux/arm64 6.6.71.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2626,6 +2626,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
# CONFIG_ZRAM_DEF_COMP_LZO is not set
CONFIG_ZRAM_DEF_COMP="lzo-rle"
CONFIG_ZRAM_WRITEBACK=y
CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
CONFIG_ZRAM_MEMORY_TRACKING=y
# CONFIG_ZRAM_MULTI_COMP is not set
CONFIG_BLK_DEV_LOOP=y
Expand Down
7 changes: 5 additions & 2 deletions SPECS/kernel/kernel-uki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

Summary: Unified Kernel Image
Name: kernel-uki
Version: 6.6.64.2
Release: 4%{?dist}
Version: 6.6.71.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi

%changelog
* Thu Jan 30 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.71.1-1
- Auto-upgrade to 6.6.71.1

* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
- Bump release to match kernel

Expand Down
6 changes: 3 additions & 3 deletions SPECS/kernel/kernel.signatures.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"Signatures": {
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
"config": "5a525032e8d3594867cc43bc4a8fb3e22851c16d48d4eb82fd1a4879dbcf2bcf",
"config_aarch64": "017245201dda4a823fc51f8e212c410d2b12ab849a2da7588d000bcb8cc48ef4",
"config": "1f353c0f3e64ba4553602961f8a2c2d1930c19171c3e962345bad3d720f9e859",
"config_aarch64": "3b7c252cf8255d488fbb5968ae1a3d4d5868a5046863faa20ed59728e2e16ee3",
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-6.6.64.2.tar.gz": "8b19b1d4db4add880154d1bf563625efc1b5f52e20792fc6e2628d63b74eb393"
"kernel-6.6.71.1.tar.gz": "63c88a9019dade77ee4414c9b3b0a968c04eaff28a4301b2ac2768dd5d979320"
}
}
7 changes: 5 additions & 2 deletions SPECS/kernel/kernel.spec
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

Summary: Linux Kernel
Name: kernel
Version: 6.6.64.2
Release: 4%{?dist}
Version: 6.6.71.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -428,6 +428,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Thu Jan 30 2025 CBL-Mariner Servicing Account <[email protected]> - 6.6.71.1-1
- Auto-upgrade to 6.6.71.1

* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
- Build PCI_HYPERV as builtin

Expand Down
16 changes: 8 additions & 8 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6530,8 +6530,8 @@
"type": "other",
"other": {
"name": "hyperv-daemons",
"version": "6.6.64.2",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-3/6.6.64.2.tar.gz"
"version": "6.6.71.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-3/6.6.71.1.tar.gz"
}
}
},
Expand Down Expand Up @@ -8171,8 +8171,8 @@
"type": "other",
"other": {
"name": "kernel",
"version": "6.6.64.2",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-3/6.6.64.2.tar.gz"
"version": "6.6.71.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-3/6.6.71.1.tar.gz"
}
}
},
Expand All @@ -8181,8 +8181,8 @@
"type": "other",
"other": {
"name": "kernel-64k",
"version": "6.6.64.2",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-3/6.6.64.2.tar.gz"
"version": "6.6.71.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-3/6.6.71.1.tar.gz"
}
}
},
Expand All @@ -8191,8 +8191,8 @@
"type": "other",
"other": {
"name": "kernel-headers",
"version": "6.6.64.2",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-3/6.6.64.2.tar.gz"
"version": "6.6.71.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-3/6.6.71.1.tar.gz"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-21.azl3.aarch64.rpm
kernel-headers-6.6.64.2-4.azl3.noarch.rpm
kernel-headers-6.6.71.1-1.azl3.noarch.rpm
glibc-2.38-8.azl3.aarch64.rpm
glibc-devel-2.38-8.azl3.aarch64.rpm
glibc-i18n-2.38-8.azl3.aarch64.rpm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-21.azl3.x86_64.rpm
kernel-headers-6.6.64.2-4.azl3.noarch.rpm
kernel-headers-6.6.71.1-1.azl3.noarch.rpm
glibc-2.38-8.azl3.x86_64.rpm
glibc-devel-2.38-8.azl3.x86_64.rpm
glibc-i18n-2.38-8.azl3.x86_64.rpm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ intltool-0.51.0-7.azl3.noarch.rpm
itstool-2.0.7-1.azl3.noarch.rpm
kbd-2.2.0-2.azl3.aarch64.rpm
kbd-debuginfo-2.2.0-2.azl3.aarch64.rpm
kernel-headers-6.6.64.2-4.azl3.noarch.rpm
kernel-headers-6.6.71.1-1.azl3.noarch.rpm
kmod-30-1.azl3.aarch64.rpm
kmod-debuginfo-30-1.azl3.aarch64.rpm
kmod-devel-30-1.azl3.aarch64.rpm
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ intltool-0.51.0-7.azl3.noarch.rpm
itstool-2.0.7-1.azl3.noarch.rpm
kbd-2.2.0-2.azl3.x86_64.rpm
kbd-debuginfo-2.2.0-2.azl3.x86_64.rpm
kernel-cross-headers-6.6.64.2-4.azl3.noarch.rpm
kernel-headers-6.6.64.2-4.azl3.noarch.rpm
kernel-cross-headers-6.6.71.1-1.azl3.noarch.rpm
kernel-headers-6.6.71.1-1.azl3.noarch.rpm
kmod-30-1.azl3.x86_64.rpm
kmod-debuginfo-30-1.azl3.x86_64.rpm
kmod-devel-30-1.azl3.x86_64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/scripts/toolchain/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ RUN wget -nv --no-clobber --timeout=30 --continue --input-file=$LFS/tools/toolch
# Disable downloading from remote sources by default. The 'toolchain-local-wget-list' generated for the above line will download from $(SOURCE_URL)
# The 'toolchain-remote-wget-list' is still available and can be used as an alternate to $(SOURCE_URL) if desired.
#RUN wget -nv --no-clobber --timeout=30 --continue --input-file=$LFS/tools/toolchain-remote-wget-list --directory-prefix=$LFS/sources; exit 0
RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-3/6.6.64.2.tar.gz -O kernel-6.6.64.2.tar.gz --directory-prefix=$LFS/sources; exit 0
RUN wget -nv --no-clobber --timeout=30 --continue https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-3/6.6.71.1.tar.gz -O kernel-6.6.71.1.tar.gz --directory-prefix=$LFS/sources; exit 0
USER root

RUN mkdir -pv $LFS/{etc,var} $LFS/usr/{bin,lib,sbin} && \
Expand Down
2 changes: 1 addition & 1 deletion toolkit/scripts/toolchain/container/toolchain-sha256sums
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898 gmp-6.3.0.tar.
1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab grep-3.11.tar.xz
6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13 groff-1.23.0.tar.gz
7454eb6935db17c6655576c2e1b0fabefd38b4d0936e0f87f48cd062ce91a057 gzip-1.13.tar.xz
8b19b1d4db4add880154d1bf563625efc1b5f52e20792fc6e2628d63b74eb393 kernel-6.6.64.2.tar.gz
63c88a9019dade77ee4414c9b3b0a968c04eaff28a4301b2ac2768dd5d979320 kernel-6.6.71.1.tar.gz
5d24e40819768f74daf846b99837fc53a3a9dcdf3ce1c2003fe0596db850f0f0 libarchive-3.7.1.tar.gz
f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb libcap-2.69.tar.xz
b8b45194989022a79ec1317f64a2a75b1551b2a55bea06f67704cb2a2e4690b0 libpipeline-1.5.7.tar.gz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ rm -rf gcc-13.2.0

touch $LFS/logs/temptoolchain/status_gcc_pass1_complete

KERNEL_VERSION="6.6.64.2"
KERNEL_VERSION="6.6.71.1"
echo Linux-${KERNEL_VERSION} API Headers
tar xf kernel-${KERNEL_VERSION}.tar.gz
pushd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-3-${KERNEL_VERSION}
Expand Down
Loading