folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable lz4 compression in systemd (#637) 

Enable lz4 compression in systemd so that journalctl can read lz4 compressed journals
This commit is contained in:
Henry Beberman 2021-02-16 14:42:40 -08:00 committed by GitHub
parent 7bd75d547d
commit 84c823f7c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SPECS/core-packages/core-packages.spec
View File

@ -1,7 +1,7 @@
Name: core-packages
Summary: Metapackage with core sets of packages
Version: 0.1
Release: 20%{?dist}
Release: 21%{?dist}
License: ASL 2.0
Group: System Environment/Base
URL: http://aka.ms/mariner
@ -61,6 +61,7 @@ Requires: findutils
Requires: grep
Requires: gzip
Requires: libtool
Requires: lz4
Requires: mariner-release
Requires: mariner-repos
Requires: mariner-rpm-macros
@ -97,6 +98,8 @@ Requires: zlib
%files container
%changelog
* Tue Feb 16 2021 Henry Beberman <henry.beberman@microsoft.com> 0.1-21
- Explicitly add lz4 to container subpackage for systemd dependency.
* Wed Sep 02 2020 Mateusz Malisz <mamalisz@microsoft.com> 0.1-20
- Add chrony package to the base-image.
* Thu Jul 23 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 0.1-19

8
SPECS/systemd/systemd-bootstrap.spec
View File

@ -1,7 +1,7 @@
Summary: Bootstrap version of systemd. Workaround for systemd circular dependency.
Name: systemd-bootstrap
Version: 239
Release: 31%{?dist}
Release: 32%{?dist}
License: LGPLv2+ AND GPLv2+ AND MIT
Vendor: Microsoft Corporation
Distribution: Mariner
@ -52,6 +52,7 @@ BuildRequires: kmod-devel
BuildRequires: libcap-devel
BuildRequires: libgcrypt-devel
BuildRequires: libxslt
BuildRequires: lz4-devel
BuildRequires: meson
BuildRequires: pam-devel
BuildRequires: perl-XML-Parser
@ -63,6 +64,7 @@ Requires: glib
Requires: kmod
Requires: libcap
Requires: libgcrypt
Requires: lz4
Requires: pam
Requires: xz
@ -109,6 +111,7 @@ meson --prefix %{_prefix} \
-Dpam=true \
-Dlibcurl=false \
-Dpolkit=true \
-Dlz4=true \
-Ddbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
-Ddbussessionservicedir=%{_datadir}/dbus-1/services \
-Ddbussystemservicedir=%{_datadir}/dbus-1/system-services \
@ -244,6 +247,9 @@ rm -rf %{buildroot}/*
%{_mandir}/man3/*
%changelog
* Fri Feb 12 2021 Henry Beberman <henry.beberman@microsoft.com> - 239-32
- Enable LZ4 so journalctl can read logs from the container host.
* Fri Nov 13 2020 Nicolas Ontiveros <niontive@microsoft.com> - 239-31
- Fix CVE-2019-6454 patch. Add upstream patch info.
- Fix CVE-2020-1712 patch. Add upstream patch info.

8
SPECS/systemd/systemd.spec
View File

@ -1,7 +1,7 @@
Summary: Systemd-239
Name: systemd
Version: 239
Release: 34%{?dist}
Release: 35%{?dist}
License: LGPLv2+ AND GPLv2+ AND MIT
Vendor: Microsoft Corporation
Distribution: Mariner
@ -61,6 +61,7 @@ BuildRequires: kmod-devel
BuildRequires: libcap-devel
BuildRequires: libgcrypt-devel
BuildRequires: libxslt
BuildRequires: lz4-devel
BuildRequires: meson
BuildRequires: pam-devel
BuildRequires: perl-XML-Parser
@ -72,6 +73,7 @@ Requires: glib
Requires: kmod
Requires: libcap
Requires: libgcrypt
Requires: lz4
Requires: pam
Requires: xz
Obsoletes: systemd-bootstrap
@ -128,6 +130,7 @@ meson --prefix %{_prefix} \
-Dpolkit=true \
-Dlibcryptsetup=true \
-Dgcrypt=true \
-Dlz4=true \
-Ddbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
-Ddbussessionservicedir=%{_datadir}/dbus-1/services \
-Ddbussystemservicedir=%{_datadir}/dbus-1/system-services \
@ -267,6 +270,9 @@ rm -rf %{buildroot}/*
%files lang -f %{name}.lang
%changelog
* Fri Feb 12 2021 Henry Beberman <henry.beberman@microsoft.com> - 239-35
- Enable LZ4 so journalctl can read logs from the container host.
* Fri Nov 13 2020 Nicolas Ontiveros <niontive@microsoft.com> - 239-34
- Fix CVE-2019-6454 patch. Add upstream patch info.
- Fix CVE-2020-1712 patch. Add upstream patch info.

1
toolkit/resources/imageconfigs/packagelists/iso-initrd-packages-arm64.json
View File

@ -36,6 +36,7 @@
"libstdc++",
"lvm2",
"lua",
"lz4",
"ncurses",
"ncurses-term",
"nspr",

1
toolkit/resources/imageconfigs/packagelists/iso-initrd-packages.json
View File

@ -39,6 +39,7 @@
"libstdc++",
"lvm2",
"lua",
"lz4",
"ncurses",
"ncurses-term",
"nspr",

17
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -232,6 +232,9 @@ lvm2-2.03.05-5.cm1.aarch64.rpm
lvm2-debuginfo-2.03.05-5.cm1.aarch64.rpm
lvm2-devel-2.03.05-5.cm1.aarch64.rpm
lvm2-libs-2.03.05-5.cm1.aarch64.rpm
lz4-1.9.2-2.cm1.aarch64.rpm
lz4-debuginfo-1.9.2-2.cm1.aarch64.rpm
lz4-devel-1.9.2-2.cm1.aarch64.rpm
m4-1.4.18-4.cm1.aarch64.rpm
m4-debuginfo-1.4.18-4.cm1.aarch64.rpm
make-4.2.1-5.cm1.aarch64.rpm
@ -353,13 +356,13 @@ sqlite-devel-3.32.3-2.cm1.aarch64.rpm
sqlite-libs-3.32.3-2.cm1.aarch64.rpm
swig-3.0.12-5.cm1.aarch64.rpm
swig-debuginfo-3.0.12-5.cm1.aarch64.rpm
systemd-239-34.cm1.aarch64.rpm
systemd-bootstrap-239-31.cm1.aarch64.rpm
systemd-bootstrap-debuginfo-239-31.cm1.aarch64.rpm
systemd-bootstrap-devel-239-31.cm1.aarch64.rpm
systemd-debuginfo-239-34.cm1.aarch64.rpm
systemd-devel-239-34.cm1.aarch64.rpm
systemd-lang-239-34.cm1.aarch64.rpm
systemd-239-35.cm1.aarch64.rpm
systemd-bootstrap-239-32.cm1.aarch64.rpm
systemd-bootstrap-debuginfo-239-32.cm1.aarch64.rpm
systemd-bootstrap-devel-239-32.cm1.aarch64.rpm
systemd-debuginfo-239-35.cm1.aarch64.rpm
systemd-devel-239-35.cm1.aarch64.rpm
systemd-lang-239-35.cm1.aarch64.rpm
tar-1.32-2.cm1.aarch64.rpm
tar-debuginfo-1.32-2.cm1.aarch64.rpm
tdnf-2.1.0-6.cm1.aarch64.rpm

17
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -232,6 +232,9 @@ lvm2-2.03.05-5.cm1.x86_64.rpm
lvm2-debuginfo-2.03.05-5.cm1.x86_64.rpm
lvm2-devel-2.03.05-5.cm1.x86_64.rpm
lvm2-libs-2.03.05-5.cm1.x86_64.rpm
lz4-1.9.2-2.cm1.x86_64.rpm
lz4-debuginfo-1.9.2-2.cm1.x86_64.rpm
lz4-devel-1.9.2-2.cm1.x86_64.rpm
m4-1.4.18-4.cm1.x86_64.rpm
m4-debuginfo-1.4.18-4.cm1.x86_64.rpm
make-4.2.1-5.cm1.x86_64.rpm
@ -353,13 +356,13 @@ sqlite-devel-3.32.3-2.cm1.x86_64.rpm
sqlite-libs-3.32.3-2.cm1.x86_64.rpm
swig-3.0.12-5.cm1.x86_64.rpm
swig-debuginfo-3.0.12-5.cm1.x86_64.rpm
systemd-239-34.cm1.x86_64.rpm
systemd-bootstrap-239-31.cm1.x86_64.rpm
systemd-bootstrap-debuginfo-239-31.cm1.x86_64.rpm
systemd-bootstrap-devel-239-31.cm1.x86_64.rpm
systemd-debuginfo-239-34.cm1.x86_64.rpm
systemd-devel-239-34.cm1.x86_64.rpm
systemd-lang-239-34.cm1.x86_64.rpm
systemd-239-35.cm1.x86_64.rpm
systemd-bootstrap-239-32.cm1.x86_64.rpm
systemd-bootstrap-debuginfo-239-32.cm1.x86_64.rpm
systemd-bootstrap-devel-239-32.cm1.x86_64.rpm
systemd-debuginfo-239-35.cm1.x86_64.rpm
systemd-devel-239-35.cm1.x86_64.rpm
systemd-lang-239-35.cm1.x86_64.rpm
tar-1.32-2.cm1.x86_64.rpm
tar-debuginfo-1.32-2.cm1.x86_64.rpm
tdnf-2.1.0-6.cm1.x86_64.rpm

2
toolkit/scripts/toolchain/build_official_toolchain_rpms.sh
View File

@ -230,6 +230,7 @@ build_rpm_in_chroot_no_install grep
build_rpm_in_chroot_no_install libffi
build_rpm_in_chroot_no_install xz
build_rpm_in_chroot_no_install zstd
build_rpm_in_chroot_no_install lz4
build_rpm_in_chroot_no_install m4
build_rpm_in_chroot_no_install libdb
build_rpm_in_chroot_no_install libcap
@ -453,6 +454,7 @@ build_rpm_in_chroot_no_install libselinux
# systemd-bootstrap requires libcap, xz, kbd, kmod, util-linux, meson, shadow-utils
chroot_and_install_rpms libcap
chroot_and_install_rpms lz4
chroot_and_install_rpms xz
chroot_and_install_rpms kbd
chroot_and_install_rpms kmod