Merge pull request #3861 from bcressey/dump-liblzma

bottlerocket-os · Mar 29, 2024 · 49b1981 · 49b1981
2 parents cf8f2b7 + 13a3ce2
commit 49b1981
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 88 deletions.
diff --git a/packages/kernel-5.10/config-bottlerocket b/packages/kernel-5.10/config-bottlerocket
@@ -91,9 +91,9 @@ CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_DECOMPRESS_ZSTD=y
 
-# Enable xz modules compression
+# Enable gz modules compression
 CONFIG_MODULE_COMPRESS=y
-CONFIG_MODULE_COMPRESS_XZ=y
+CONFIG_MODULE_COMPRESS_GZIP=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
@@ -115,9 +115,9 @@ CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_DECOMPRESS_ZSTD=y
 
-# Enable xz modules compression
+# Enable gz modules compression
 # CONFIG_MODULE_COMPRESS_NONE is not set
-CONFIG_MODULE_COMPRESS_XZ=y
+CONFIG_MODULE_COMPRESS_GZIP=y
 
 # Add virtio drivers for development setups running as guests in qemu
 CONFIG_VIRTIO_CONSOLE=m

diff --git a/packages/kernel-6.1/config-bottlerocket b/packages/kernel-6.1/config-bottlerocket
@@ -120,9 +120,9 @@ CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_DECOMPRESS_ZSTD=y
 
-# Enable xz modules compression
+# Enable gz modules compression
 # CONFIG_MODULE_COMPRESS_NONE is not set
-CONFIG_MODULE_COMPRESS_XZ=y
+CONFIG_MODULE_COMPRESS_GZIP=y
 
 # Add virtio drivers for development setups running as guests in qemu
 CONFIG_VIRTIO_CONSOLE=m

diff --git a/packages/kmod/Cargo.toml b/packages/kmod/Cargo.toml
@@ -17,5 +17,5 @@ sha512 = "05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc3
 
 [build-dependencies]
 glibc = { path = "../glibc" }
-liblzma = { path = "../liblzma" }
+libz = { path = "../libz" }
 libzstd = { path = "../libzstd" }
diff --git a/packages/kmod/kmod.spec b/packages/kmod/kmod.spec
@@ -6,9 +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}libz-devel
 BuildRequires: %{_cross_os}libzstd-devel
-Requires: %{_cross_os}liblzma
+Requires: %{_cross_os}libz
 Requires: %{_cross_os}libzstd
 
 %description
@@ -28,10 +28,9 @@ cp tools/COPYING COPYING.GPL
 
 %build
 %cross_configure \
-  --with-xz \
+  --with-zlib \
   --with-zstd \
-  --without-openssl \
-  --without-zlib
+  --without-openssl
 
 %make_build
 

diff --git a/packages/liblzma/Cargo.toml b/packages/liblzma/Cargo.toml
diff --git a/packages/liblzma/liblzma.spec b/packages/liblzma/liblzma.spec
diff --git a/variants/Cargo.lock b/variants/Cargo.lock