Merge pull request #2356 from gthao313/1.9.x

Cherry pick commits from develop into 1.9.x for 1.9.1 release
bottlerocket-os · Aug 16, 2022 · 614cec9 · 614cec9
2 parents 159e4ce + 0957ebb
commit 614cec9
Show file tree

Hide file tree

Showing 16 changed files with 277 additions and 135 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# v1.9.1 (2022-08-17)
+
+## OS Changes
+
+* Change kernel module compression from zstd to xz ([#2323])
+* Update ECR registry map for new AWS regions ([#2336])
+* Add new regions to pause registry map ([#2349])
+* Update `tough` to v0.8.1 ([#2338])
+
+[#2323]: https://github.com/bottlerocket-os/bottlerocket/pull/2323
+[#2336]: https://github.com/bottlerocket-os/bottlerocket/pull/2336
+[#2338]: https://github.com/bottlerocket-os/bottlerocket/pull/2338
+[#2349]: https://github.com/bottlerocket-os/bottlerocket/pull/2349
+
 # v1.9.0 (2022-07-28)
 
 ## OS Changes

diff --git a/Makefile.toml b/Makefile.toml
@@ -44,7 +44,7 @@ PUBLISH_INFRA_CONFIG_PATH = "${BUILDSYS_ROOT_DIR}/Infra.toml"
 PUBLISH_REPO = "default"
 # The version of tuftool (without the 'v') that we will install and use for
 # publishing-related steps
-PUBLISH_TUFTOOL_VERSION="0.7.2"
+PUBLISH_TUFTOOL_VERSION="0.8.1"
 
 # The size in GiB of the data volume in the block device mapping of registered
 # AMIs.  (You can also specify PUBLISH_ROOT_VOLUME_SIZE to override the root

diff --git a/Release.toml b/Release.toml
@@ -1,4 +1,4 @@
-version = "1.9.0"
+version = "1.9.1"
 
 [migrations]
 "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -140,3 +140,5 @@ version = "1.9.0"
     "migrate_v1.9.0_kubelet-no-daemon-reload.lz4",
     "migrate_v1.9.0_updates-targets-base-url.lz4",
 ]
+"(1.9.0, 1.9.1)" = [
+]
diff --git a/packages/kernel-5.10/config-bottlerocket b/packages/kernel-5.10/config-bottlerocket
@@ -82,9 +82,9 @@ CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_DECOMPRESS_ZSTD=y
 
-# Enable ZSTD modules compression
+# Enable xz modules compression
 CONFIG_MODULE_COMPRESS=y
-CONFIG_MODULE_COMPRESS_ZSTD=y
+CONFIG_MODULE_COMPRESS_XZ=y
 
 # Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for
 # them before mounting the root device.

diff --git a/packages/kernel-5.15/config-bottlerocket b/packages/kernel-5.15/config-bottlerocket
@@ -82,9 +82,9 @@ CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_DECOMPRESS_ZSTD=y
 
-# Enable ZSTD modules compression
+# Enable xz modules compression
 # CONFIG_MODULE_COMPRESS_NONE is not set
-CONFIG_MODULE_COMPRESS_ZSTD=y
+CONFIG_MODULE_COMPRESS_XZ=y
 
 # Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for
 # them before mounting the root device.

diff --git a/packages/kernel-5.4/config-bottlerocket b/packages/kernel-5.4/config-bottlerocket
@@ -77,9 +77,9 @@ CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_DECOMPRESS_ZSTD=y
 
-# Enable ZSTD modules compression
+# Enable xz modules compression
 CONFIG_MODULE_COMPRESS=y
-CONFIG_MODULE_COMPRESS_ZSTD=y
+CONFIG_MODULE_COMPRESS_XZ=y
 
 # Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for
 # them before mounting the root device.

diff --git a/packages/kmod/Cargo.toml b/packages/kmod/Cargo.toml
@@ -17,4 +17,5 @@ sha512 = "e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d
 
 [build-dependencies]
 glibc = { path = "../glibc" }
+liblzma = { path = "../liblzma" }
 libzstd = { path = "../libzstd" }
diff --git a/packages/kmod/kmod.spec b/packages/kmod/kmod.spec
@@ -6,7 +6,9 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later
 URL: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
 Source0: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%{version}.tar.xz
 BuildRequires: %{_cross_os}glibc-devel
+BuildRequires: %{_cross_os}liblzma-devel
 BuildRequires: %{_cross_os}libzstd-devel
+Requires: %{_cross_os}liblzma
 Requires: %{_cross_os}libzstd
 
 %description
@@ -26,10 +28,10 @@ cp tools/COPYING COPYING.GPL
 
 %build
 %cross_configure \
+  --with-xz \
   --with-zstd \
   --without-openssl \
-  --without-zlib \
-  --without-xz
+  --without-zlib
 
 %make_build
 

diff --git a/packages/liblzma/Cargo.toml b/packages/liblzma/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "liblzma"
+version = "0.1.0"
+edition = "2018"
+publish = false
+build = "build.rs"
+
+[lib]
+path = "pkg.rs"
+
+[package.metadata.build-package]
+releases-url = "https://tukaani.org/xz"
+
+[[package.metadata.build-package.external-files]]
+url = "https://tukaani.org/xz/xz-5.2.5.tar.xz"
+sha512 = "59266068a51cb616eb31b67cd8f07ffeb2288d1391c61665ae2ec6814465afac80fec69248f6a2f2db45b44475af001296a99af6a32287226a9c41419173ccbb"
+
+[build-dependencies]
+glibc = { path = "../glibc" }
diff --git a/packages/liblzma/build.rs b/packages/liblzma/build.rs
@@ -0,0 +1,9 @@
+use std::process::{exit, Command};
+
+fn main() -> Result<(), std::io::Error> {
+    let ret = Command::new("buildsys").arg("build-package").status()?;
+    if !ret.success() {
+        exit(1);
+    }
+    Ok(())
+}
diff --git a/packages/liblzma/liblzma.spec b/packages/liblzma/liblzma.spec
@@ -0,0 +1,49 @@
+Name: %{_cross_os}liblzma
+Version: 5.2.5
+Release: 1%{?dist}
+Summary: Library for XZ and LZMA compressed files
+URL: https://tukaani.org/xz
+License: LicenseRef-scancode-lzma-sdk-pd
+Source: https://tukaani.org/xz/xz-%{version}.tar.xz
+BuildRequires: %{_cross_os}glibc-devel
+
+%description
+%{summary}.
+
+%package devel
+Summary: Files for development using the library for XZ and LZMA compression
+Requires: %{name}
+
+%description devel
+%{summary}.
+
+%prep
+%setup -n xz-%{version}
+
+%build
+%cross_configure \
+  --disable-doc \
+  --disable-lzma-links \
+  --disable-lzmadec \
+  --disable-lzmainfo \
+  --disable-scripts \
+  --disable-xz \
+  --disable-xzdec
+%make_build
+
+%install
+%make_install
+
+%files
+%license COPYING
+%{_cross_attribution_file}
+%{_cross_libdir}/*.so.*
+%exclude %{_cross_localedir}
+
+%files devel
+%{_cross_includedir}/*.h
+%{_cross_includedir}/lzma/*.h
+%{_cross_libdir}/*.a
+%{_cross_libdir}/*.so
+%{_cross_pkgconfigdir}/*.pc
+%exclude %{_cross_libdir}/*.la
diff --git a/packages/liblzma/pkg.rs b/packages/liblzma/pkg.rs
@@ -0,0 +1 @@
+// not used
diff --git a/sources/Cargo.lock b/sources/Cargo.lock