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.

Sign up for GitHub

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

Jump to bottom

remove the liblzma package #3861

Merged
merged 3 commits into from
Mar 29, 2024
Merged

remove the liblzma package #3861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2dfb71
kernel: compress modules with gzip
bcressey Mar 29, 2024
12fea8f
kmod: build with zlib instead of lzma
bcressey Mar 29, 2024
13a3ce2
packages: remove liblzma
bcressey Mar 29, 2024
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
4 changes: 2 additions & 2 deletions packages/kernel-5.10/config-bottlerocket
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions packages/kernel-5.15/config-bottlerocket
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/kernel-6.1/config-bottlerocket
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/kmod/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ sha512 = "05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc3

[build-dependencies]
glibc = { path = "../glibc" }
liblzma = { path = "../liblzma" }
libz = { path = "../libz" }
libzstd = { path = "../libzstd" }
9 changes: 4 additions & 5 deletions packages/kmod/kmod.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
19 changes: 0 additions & 19 deletions packages/liblzma/Cargo.toml
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions packages/liblzma/liblzma.spec
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions variants/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.