-
Notifications
You must be signed in to change notification settings - Fork 50
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.
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
feat(24.10): forward-port 24.04 slices #339
feat(24.10): forward-port 24.04 slices #339
Conversation
Diff of dependencies: slices/apparmor.yaml@@ -1,3 +1,2 @@
-debconf
-debconf-2.0
libc6
+lsb-base slices/base-files.yaml@@ -1,3 +0,0 @@
-awk
-libc6
-libcrypt1 slices/base-passwd.yaml@@ -1,3 +0,0 @@
-libc6
-libdebconfclient0
-libselinux1 slices/bash.yaml@@ -1,4 +1,2 @@
-base-files
-debianutils
libc6
libtinfo6 slices/ca-certificates.yaml@@ -1,3 +1,6 @@
-debconf
-debconf-2.0
+base-files
+bash
+coreutils
+findutils
openssl
+sed slices/dash.yaml@@ -1,2 +1 @@
-debianutils
libc6 slices/dbus-system-bus-common.yaml@@ -1 +0,0 @@
-adduser slices/grep.yaml@@ -1,2 +1,3 @@
+dash
libc6
libpcre2-8-0 slices/libc-bin.yaml@@ -1 +0,0 @@
-libc6 slices/libc6.yaml@@ -1 +1 @@
-libgcc-s1
+base-files slices/libpam-modules.yaml@@ -1,10 +1,7 @@
-debconf
-debconf-2.0
libaudit1
libc6
libcrypt1
libdb5.3t64
-libpam-modules-bin
libpam0g
libselinux1
libsystemd0 slices/libpam-runtime.yaml@@ -1,4 +0,0 @@
-cdebconf
-debconf
-debconf-2.0
-libpam-modules slices/libpam0g.yaml@@ -1,4 +1,2 @@
-debconf
-debconf-2.0
libaudit1
libc6 slices/libpython3.12-stdlib.yaml@@ -3,6 +3,7 @@
libcrypt1
libdb5.3t64
libffi8
+libgcc-s1
liblzma5
libncursesw6
libnsl2
@@ -13,6 +14,5 @@
libtirpc3t64
libuuid1
media-types
-mime-support
netbase
tzdata slices/librtmp1.yaml@@ -1,6 +1,6 @@
libc6
libgmp10
-libgnutls30
-libhogweed6
-libnettle8
+libgnutls30t64
+libhogweed6t64
+libnettle8t64
zlib1g slices/libsystemd-shared.yaml@@ -10,3 +10,4 @@
libseccomp2
libselinux1
libssl3t64
+libzstd1 slices/libtiff6.yaml@@ -2,7 +2,6 @@
libdeflate0
libjbig0
libjpeg8
-liblerc4
liblzma5
libwebp7
libzstd1 slices/node-acorn.yaml@@ -1,2 +1 @@
node-xtend
-nodejs slices/node-undici.yaml@@ -0,0 +1 @@
+node-busboy slices/openssh-client.yaml@@ -1,4 +1,3 @@
-adduser
libc6
libedit2
libfido2-1 slices/openssh-server.yaml@@ -1,6 +1,3 @@
-adduser
-debconf
-debconf-2.0
init-system-helpers
libaudit1
libc6 slices/passwd.yaml@@ -9,4 +9,3 @@
libpam0g
libselinux1
libsemanage2
-login slices/procps.yaml@@ -1,4 +1,3 @@
-init-system-helpers
libc6
libncursesw6
libproc2-0 slices/python3.12.yaml@@ -1,5 +1,4 @@
libpython3.12-stdlib
media-types
-mime-support
python3.12-minimal
tzdata slices/tzdata.yaml@@ -1,2 +0,0 @@
-debconf
-debconf-2.0 slices/ucf.yaml@@ -1,3 +1 @@
-debconf
-debconf-2.0
sensible-utils |
It might be too soon to port the slices into 24.10 release.
I am putting a "Blocked" label on this PR. We should probably wait a bit longer before working on this. |
a321509
to
da63119
Compare
This commit imports all slices from the 24.04 release.
The tests/ dir and spread.yaml files were imported. Later on, the tests/spread/integration/systemd/ dir was removed due to earlier issues with systemd slices.
libnode109 is not available for Ubuntu 24.10. nodejs depends on libnode115.
The 24.04 slices of systemd are raising too much conflicts with the 24.10 package. We need an expert doing the backport here, if systemd is needed in 24.10. TODO seek help from Philip @Meulengracht. Error logs below (long): INFO: Installing systemd-dev_copyright on amd64... INFO: Installing systemd-dev_dbus-interfaces on amd64... INFO: Installing systemd_bins on amd64... ... error: cannot extract from package "systemd": no content at: - /usr/bin/systemd - /usr/bin/systemd-cryptenroll - /usr/bin/systemd-cryptsetup - /usr/bin/systemd-repart - /usr/lib/*-linux-*/cryptsetup/libcryptsetup-token-systemd-fido2.so - /usr/lib/*-linux-*/cryptsetup/libcryptsetup-token-systemd-pkcs11.so - /usr/lib/*-linux-*/cryptsetup/libcryptsetup-token-systemd-tpm2.so - /usr/lib/systemd/repart/definitions/confext.repart.d/10-root.conf - /usr/lib/systemd/repart/definitions/confext.repart.d/20-root-verity.conf - /usr/lib/systemd/repart/definitions/confext.repart.d/30-root-verity-sig.conf - /usr/lib/systemd/repart/definitions/portable.repart.d/10-root.conf - /usr/lib/systemd/repart/definitions/portable.repart.d/20-root-verity.conf - /usr/lib/systemd/repart/definitions/portable.repart.d/30-root-verity-sig.conf - /usr/lib/systemd/repart/definitions/sysext.repart.d/10-root.conf - /usr/lib/systemd/repart/definitions/sysext.repart.d/20-root-verity.conf - /usr/lib/systemd/repart/definitions/sysext.repart.d/30-root-verity-sig.conf - /usr/lib/systemd/system-generators/systemd-cryptsetup-generator - /usr/lib/systemd/system-generators/systemd-integritysetup-generator - /usr/lib/systemd/system-generators/systemd-veritysetup-generator - /usr/lib/systemd/system/cryptsetup-pre.target - /usr/lib/systemd/system/cryptsetup.target - /usr/lib/systemd/system/initrd-root-device.target.wants/remote-cryptsetup.target - /usr/lib/systemd/system/initrd-root-device.target.wants/remote-veritysetup.target - /usr/lib/systemd/system/initrd-root-fs.target.wants/systemd-repart.service - /usr/lib/systemd/system/integritysetup-pre.target - /usr/lib/systemd/system/integritysetup.target - /usr/lib/systemd/system/quotaon.service - /usr/lib/systemd/system/remote-cryptsetup.target - /usr/lib/systemd/system/remote-veritysetup.target - /usr/lib/systemd/system/sysinit.target.wants/cryptsetup.target - /usr/lib/systemd/system/sysinit.target.wants/integritysetup.target - /usr/lib/systemd/system/sysinit.target.wants/systemd-repart.service - /usr/lib/systemd/system/sysinit.target.wants/veritysetup.target - /usr/lib/systemd/system/system-systemd\x2dcryptsetup.slice - /usr/lib/systemd/system/system-systemd\x2dveritysetup.slice - /usr/lib/systemd/system/systemd-quotacheck.service - /usr/lib/systemd/system/systemd-repart.service - /usr/lib/systemd/system/systemd-sysupdate-reboot.service - /usr/lib/systemd/system/systemd-sysupdate-reboot.timer - /usr/lib/systemd/system/systemd-sysupdate.service - /usr/lib/systemd/system/systemd-sysupdate.timer - /usr/lib/systemd/system/systemd-time-wait-sync.service - /usr/lib/systemd/system/veritysetup-pre.target - /usr/lib/systemd/system/veritysetup.target - /usr/lib/systemd/systemd-cryptsetup - /usr/lib/systemd/systemd-integritysetup - /usr/lib/systemd/systemd-sysupdate - /usr/lib/systemd/systemd-time-wait-sync - /usr/lib/systemd/systemd-veritysetup INFO: Installing systemd_catalog on amd64... INFO: Installing systemd_config on amd64... INFO: Installing systemd_copyright on amd64... INFO: Installing systemd_dbus-services on amd64... INFO: Installing systemd_extras on amd64... ... error: cannot extract from package "systemd": no content at: - /etc/sysctl.d/99-sysctl.conf - /usr/share/systemd/tmp.mount INFO: Installing systemd_generated-services on amd64... INFO: Installing systemd_kernel-install on amd64... INFO: Installing systemd_kernel-parameters on amd64... INFO: Installing systemd_libs on amd64... ... error: cannot extract from package "systemd": no content at: - /usr/lib/*-linux-*/cryptsetup/libcryptsetup-token-systemd-fido2.so - /usr/lib/*-linux-*/cryptsetup/libcryptsetup-token-systemd-pkcs11.so - /usr/lib/*-linux-*/cryptsetup/libcryptsetup-token-systemd-tpm2.so INFO: Installing systemd_modprobe-config on amd64... INFO: Installing systemd_network on amd64... INFO: Installing systemd_pam-profile on amd64... INFO: Installing systemd_pcrlock on amd64... INFO: Installing systemd_polkit on amd64... INFO: Installing systemd_repart on amd64... ... error: cannot extract from package "systemd": no content at: - /usr/lib/systemd/repart/definitions/confext.repart.d/10-root.conf - /usr/lib/systemd/repart/definitions/confext.repart.d/20-root-verity.conf - /usr/lib/systemd/repart/definitions/confext.repart.d/30-root-verity-sig.conf - /usr/lib/systemd/repart/definitions/portable.repart.d/10-root.conf - /usr/lib/systemd/repart/definitions/portable.repart.d/20-root-verity.conf - /usr/lib/systemd/repart/definitions/portable.repart.d/30-root-verity-sig.conf - /usr/lib/systemd/repart/definitions/sysext.repart.d/10-root.conf - /usr/lib/systemd/repart/definitions/sysext.repart.d/20-root-verity.conf - /usr/lib/systemd/repart/definitions/sysext.repart.d/30-root-verity-sig.conf - /usr/lib/systemd/system/initrd-root-fs.target.wants/systemd-repart.service - /usr/lib/systemd/system/sysinit.target.wants/systemd-repart.service - /usr/lib/systemd/system/systemd-repart.service INFO: Installing systemd_system-generators on amd64... ... error: cannot extract from package "systemd": no content at: - /usr/lib/systemd/system-generators/systemd-cryptsetup-generator - /usr/lib/systemd/system-generators/systemd-integritysetup-generator - /usr/lib/systemd/system-generators/systemd-veritysetup-generator INFO: Installing systemd_system-services on amd64... ... error: cannot extract from package "systemd": no content at: - /usr/lib/systemd/system/cryptsetup-pre.target - /usr/lib/systemd/system/cryptsetup.target - /usr/lib/systemd/system/initrd-root-device.target.wants/remote-cryptsetup.target - /usr/lib/systemd/system/initrd-root-device.target.wants/remote-veritysetup.target - /usr/lib/systemd/system/integritysetup-pre.target - /usr/lib/systemd/system/integritysetup.target - /usr/lib/systemd/system/quotaon.service - /usr/lib/systemd/system/remote-cryptsetup.target - /usr/lib/systemd/system/remote-veritysetup.target - /usr/lib/systemd/system/sysinit.target.wants/cryptsetup.target - /usr/lib/systemd/system/sysinit.target.wants/integritysetup.target - /usr/lib/systemd/system/sysinit.target.wants/veritysetup.target - /usr/lib/systemd/system/system-systemd\x2dcryptsetup.slice - /usr/lib/systemd/system/system-systemd\x2dveritysetup.slice - /usr/lib/systemd/system/systemd-quotacheck.service - /usr/lib/systemd/system/systemd-sysupdate-reboot.service - /usr/lib/systemd/system/systemd-sysupdate-reboot.timer - /usr/lib/systemd/system/systemd-sysupdate.service - /usr/lib/systemd/system/systemd-sysupdate.timer - /usr/lib/systemd/system/systemd-time-wait-sync.service - /usr/lib/systemd/system/veritysetup-pre.target - /usr/lib/systemd/system/veritysetup.target INFO: Installing systemd_sysusers-config on amd64... INFO: Installing systemd_tmpfiles-config on amd64... INFO: Installing systemd_udev-rules on amd64... INFO: Installing systemd_user-services on amd64... INFO: Installing sysvinit-utils_bins on amd64... INFO: Installing sysvinit-utils_config on amd64... INFO: Installing sysvinit-utils_copyright on amd64...
The /etc/init.d/procps script is no longer packed.
Seems like it is not needed in 24.10, at least not listed as such. @Meulengracht might be able to confirm.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see comment above
Nice. This is a lot of work! I have a few points I couldn't add to the diff. Why did we remove the systemd slice? I think these lib slices that were removed can be updated to the latest version.
|
Hey @rebornplusplus |
|
||
libs: | ||
essential: | ||
- libaudit1_libs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
apt show
declares we may also need libpam-modules-bin
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmmm.... some of the .so
here does mention the binaries in libpam-modules-bin
. For example:
root@acdf7f8ae575:~/libpam-modules# strings ./usr/lib/x86_64-linux-gnu/security/pam_extrausers.so | grep pam_extrausers_chkpwd
/usr/sbin/pam_extrausers_chkpwd
pam_extrausers_chkpwd waitpid returned %d: %m
pam_extrausers_chkpwd abnormal exit: %d
read pam_extrausers_chkpwd output error %d: %m
I kept it identical to 24.04 because the files have not changed since then. This was added in #142 by @Meulengracht. If we need to change it, I think we will need to do so in 24.04 first. I would like to keep that out of the scope of forward-porting. But something we should definitely check out.
Pushed 71ba30e. |
Replacement of librav1e0.
Replacement of libsvtav1enc1d1.
Replacement of libunibreak5.
Replacement of libx265-199.
Sorry, missed your comment earlier @clay-lake.
Too many changes. It's probably for the best to create a new PR for that if we need it.
Added them, thank you for finding those! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great thanks! It's good to go IMO. Waiting for a 2nd review
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks for the great effort!
This PR forward-ports the 24.04 slices into the new 24.10 branch.
Highlights:
Changes from 24.04