From a8e4a20ca7d1dde4e8b5f679e4e11d9687b6ef09 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Mon, 7 Mar 2022 18:55:10 +0000 Subject: [PATCH 1/4] kernel-5.4: Update to 5.4.181 --- ...fsx-Disable-Werror-stringop-overflow.patch | 20 ------------------- packages/kernel-5.4/Cargo.toml | 4 ++-- packages/kernel-5.4/kernel-5.4.spec | 7 ++----- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 packages/kernel-5.4/3001-lustrefsx-Disable-Werror-stringop-overflow.patch diff --git a/packages/kernel-5.4/3001-lustrefsx-Disable-Werror-stringop-overflow.patch b/packages/kernel-5.4/3001-lustrefsx-Disable-Werror-stringop-overflow.patch deleted file mode 100644 index b5273f981c1..00000000000 --- a/packages/kernel-5.4/3001-lustrefsx-Disable-Werror-stringop-overflow.patch +++ /dev/null @@ -1,20 +0,0 @@ -From a5f6b26082e0022d3c3e70e0718e4787939778d8 Mon Sep 17 00:00:00 2001 -From: iliana destroyer of worlds -Date: Tue, 30 Jul 2019 12:59:09 -0700 -Subject: [PATCH] lustrefsx: Disable -Werror=stringop-overflow= - -Signed-off-by: iliana destroyer of worlds ---- - drivers/staging/lustrefsx/Makefile.rules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/staging/lustrefsx/Makefile.rules b/drivers/staging/lustrefsx/Makefile.rules -index a0d56e80f2ce..62390580a3b4 100644 ---- a/drivers/staging/lustrefsx/Makefile.rules -+++ b/drivers/staging/lustrefsx/Makefile.rules -@@ -3,4 +3,4 @@ ccflags-y += -include $(srctree)/drivers/staging/lustrefsx/config.h - ccflags-y += -I$(srctree)/drivers/staging/lustrefsx/libcfs/include - ccflags-y += -I$(srctree)/drivers/staging/lustrefsx/lnet/include - ccflags-y += -I$(srctree)/drivers/staging/lustrefsx/lustre/include --ccflags-y += -Wno-format-truncation -Werror -+ccflags-y += -Wno-format-truncation -Werror -Wno-error=stringop-overflow= diff --git a/packages/kernel-5.4/Cargo.toml b/packages/kernel-5.4/Cargo.toml index c3c82f2cae5..817a2d91a17 100644 --- a/packages/kernel-5.4/Cargo.toml +++ b/packages/kernel-5.4/Cargo.toml @@ -13,8 +13,8 @@ path = "pkg.rs" [[package.metadata.build-package.external-files]] # Use latest-srpm-url.sh to get this. -url = "https://cdn.amazonlinux.com/blobstore/32434003a841c9b7972e98167c4819504db24bb87f1a757a3d4bfc16f3c9e4e1/kernel-5.4.176-91.338.amzn2.src.rpm" -sha512 = "0a82d9b33367962da076d36dedaa6dc94968dbbd4581b0ead6a565fe04f0d3364b0d10ae57150d989748a379036d95464c17b89273a56a814fd176e229706000" +url = "https://cdn.amazonlinux.com/blobstore/d8a7e800750161a038954b2685ca8c5fb0a0dac22057530c4c0233d60f06c2d3/kernel-5.4.181-99.354.amzn2.src.rpm" +sha512 = "39903e5164ea966b62ddfa70ffd9a73ba50af363cf87d20011ad8d2f1e471857b79503da75770a1e812058c9cd2a17a88000e6e9a4c44580d3c4210144aa3993" [build-dependencies] microcode = { path = "../microcode" } diff --git a/packages/kernel-5.4/kernel-5.4.spec b/packages/kernel-5.4/kernel-5.4.spec index 440d694754b..9896881af98 100644 --- a/packages/kernel-5.4/kernel-5.4.spec +++ b/packages/kernel-5.4/kernel-5.4.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} Name: %{_cross_os}kernel-5.4 -Version: 5.4.176 +Version: 5.4.181 Release: 1%{?dist} Summary: The Linux kernel License: GPL-2.0 WITH Linux-syscall-note URL: https://www.kernel.org/ # Use latest-srpm-url.sh to get this. -Source0: https://cdn.amazonlinux.com/blobstore/32434003a841c9b7972e98167c4819504db24bb87f1a757a3d4bfc16f3c9e4e1/kernel-5.4.176-91.338.amzn2.src.rpm +Source0: https://cdn.amazonlinux.com/blobstore/d8a7e800750161a038954b2685ca8c5fb0a0dac22057530c4c0233d60f06c2d3/kernel-5.4.181-99.354.amzn2.src.rpm Source100: config-bottlerocket # Help out-of-tree module builds run `make prepare` automatically. @@ -24,9 +24,6 @@ Patch2005: 2005-.gitignore-Add-ZSTD-compressed-files.patch Patch2006: 2006-kbuild-move-module-strip-compression-code-into-scrip.patch Patch2007: 2007-kbuild-add-support-for-zstd-compressed-modules.patch -# Make Lustre FSx work with a newer GCC. -Patch3001: 3001-lustrefsx-Disable-Werror-stringop-overflow.patch - BuildRequires: bc BuildRequires: elfutils-devel BuildRequires: hostname From 3d0c10abeecb9f69b6ec598fd5137cb146a46b6e Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Mon, 7 Mar 2022 19:06:37 +0000 Subject: [PATCH 2/4] kernel-5.10: Update to 5.10.102 --- packages/kernel-5.10/Cargo.toml | 4 ++-- packages/kernel-5.10/kernel-5.10.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/kernel-5.10/Cargo.toml b/packages/kernel-5.10/Cargo.toml index ed9e3f77e13..b0127392410 100644 --- a/packages/kernel-5.10/Cargo.toml +++ b/packages/kernel-5.10/Cargo.toml @@ -13,8 +13,8 @@ path = "pkg.rs" [[package.metadata.build-package.external-files]] # Use latest-srpm-url.sh to get this. -url = "https://cdn.amazonlinux.com/blobstore/3d651c178d1a236b1ea38ddbd548d5402442c60003960ea61daf53e52d360d36/kernel-5.10.96-90.460.amzn2.src.rpm" -sha512 = "d95699f9a039f91899a5772081e17d523c6752faf0fd2edfc2f1394b2b0ba6cee05b05af234f029e3d0ef705b4ee05d86be92413215265db379d8c8ad21bdbbd" +url = "https://cdn.amazonlinux.com/blobstore/abd0b3e08ff7d32abb916b2664e8de68bd7d16dbbfdcfe8e574d832aa19a3b1e/kernel-5.10.102-99.473.amzn2.src.rpm" +sha512 = "ed17395fed0480d87e59f80899953641169fae7ef2f34eb74bad66ff92b2eec5c72dbff4a08af49de516cde8fe96218a102857e048073dd6d48fb73be4ef19e0" [build-dependencies] microcode = { path = "../microcode" } diff --git a/packages/kernel-5.10/kernel-5.10.spec b/packages/kernel-5.10/kernel-5.10.spec index 3a1bb6b3c53..e61f5e07567 100644 --- a/packages/kernel-5.10/kernel-5.10.spec +++ b/packages/kernel-5.10/kernel-5.10.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} Name: %{_cross_os}kernel-5.10 -Version: 5.10.96 +Version: 5.10.102 Release: 1%{?dist} Summary: The Linux kernel License: GPL-2.0 WITH Linux-syscall-note URL: https://www.kernel.org/ # Use latest-srpm-url.sh to get this. -Source0: https://cdn.amazonlinux.com/blobstore/3d651c178d1a236b1ea38ddbd548d5402442c60003960ea61daf53e52d360d36/kernel-5.10.96-90.460.amzn2.src.rpm +Source0: https://cdn.amazonlinux.com/blobstore/abd0b3e08ff7d32abb916b2664e8de68bd7d16dbbfdcfe8e574d832aa19a3b1e/kernel-5.10.102-99.473.amzn2.src.rpm Source100: config-bottlerocket # Help out-of-tree module builds run `make prepare` automatically. From 6b20d5f917d219192865a33c0ce083619fe5376e Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Mon, 7 Mar 2022 22:38:28 +0000 Subject: [PATCH 3/4] Update Release.toml for 1.6.2 --- Release.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Release.toml b/Release.toml index 13fe2ced7f0..50304e7ec21 100644 --- a/Release.toml +++ b/Release.toml @@ -1,4 +1,4 @@ -version = "1.6.1" +version = "1.6.2" [migrations] "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"] From 5d6cc099d247ecc12e8250898c48d9ee762f8c42 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Mon, 7 Mar 2022 23:35:06 +0000 Subject: [PATCH 4/4] Update CHANGELOG.md for 1.6.2 --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4f776a0dc3..4c95fa69574 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,40 @@ +# v1.6.2 (2022-03-08) + +With this release, the vmware-k8s variants have graduated from preview status and are now generally available. +:tada: + +## Security Fixes + +* Update kernel-5.4 and kernel-5.10 to include recent security fixes ([a8e4a20ca7d1][a8e4a20ca7d1], [3d0c10abeecb][3d0c10abeecb]) + +## OS Changes + +* Add support for Kubernetes 1.22 variants ([#1962]) +* Add settings support for registry credentials ([#1955]) +* Add support for AWS CloudFormation signaling ([#1728], thanks, @mello7tre!) +* Add TCMU support to the kernel ([#1953], thanks, @cvlc!) +* Fix issue with closing frame construction in apiserver ([#1948]) + +## Build Changes + +* Fix dead code warning during build in netdog ([#1949]) + +## Documentation Changes + +* Correct variable name in bootstrap-containers/README.md ([#1959], thanks, @dangen-effy!) +* Add art to the console ([#1970]) + +[a8e4a20ca7d1]: https://github.com/bottlerocket-os/bottlerocket/commit/a8e4a20ca7d1dde4e8b5f679e4e11d9687b6ef09 +[3d0c10abeecb]: https://github.com/bottlerocket-os/bottlerocket/commit/3d0c10abeecb9f69b6ec598fd5137cb146a46b6e +[#1728]: https://github.com/bottlerocket-os/bottlerocket/pull/1728 +[#1948]: https://github.com/bottlerocket-os/bottlerocket/pull/1948 +[#1949]: https://github.com/bottlerocket-os/bottlerocket/pull/1949 +[#1953]: https://github.com/bottlerocket-os/bottlerocket/pull/1953 +[#1955]: https://github.com/bottlerocket-os/bottlerocket/pull/1955 +[#1959]: https://github.com/bottlerocket-os/bottlerocket/pull/1959 +[#1962]: https://github.com/bottlerocket-os/bottlerocket/pull/1962 +[#1970]: https://github.com/bottlerocket-os/bottlerocket/pull/1970 + # v1.6.1 (2022-03-02) ## Security Fixes