From 05644e4ce4886d97a712fcdca7d4144a7ced4191 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Dec 2023 23:32:21 +0000 Subject: gentoo auto-resync : 12:12:2023 - 23:32:21 --- sys-kernel/dracut/Manifest | 3 + sys-kernel/dracut/dracut-059-r6.ebuild | 161 +++++++++++++++++++++ sys-kernel/dracut/files/059-systemd-executor.patch | 31 ++++ sys-kernel/dracut/files/059-systemd-pcrphase.patch | 91 ++++++++++++ 4 files changed, 286 insertions(+) create mode 100644 sys-kernel/dracut/dracut-059-r6.ebuild create mode 100644 sys-kernel/dracut/files/059-systemd-executor.patch create mode 100644 sys-kernel/dracut/files/059-systemd-pcrphase.patch (limited to 'sys-kernel/dracut') diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 671e5ddfa4ad..d13d34483125 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,5 +1,7 @@ AUX 059-gawk.patch 1349 BLAKE2B a4c778afb4bded425fd578a4b5b93f4a83924148e64b7ef3c68967626eaa1072b322b3c6ee87dcfcae013ecb12869f3d51977926357cab83cb3404dcecba5787 SHA512 a50e1b74186450fafb3f396c11744b964d67923740627c88d381b0041e3b870a5fea6df8c2119d67ecfdd560d8ea26bf72fea7e7ab70b4fae9e8d035d72d0fe0 AUX 059-kernel-install-uki.patch 5396 BLAKE2B fe6ecd2b6a3b549cc2f54bd9f933495cd081761b960528a7cf3fcdecf441057325d03e32b0f04f6bf5698ce225892cc841484d4925a66d9f3e4f4b9e59dd4e2a SHA512 08ab3b47a6f4a0507ec12647ced54cf64a20d2df4b7653aa1882c9184be53b9cc8290854c2d3bd84888b0a22105d3e513d9e019d232db82bdd1a888bf50f3212 +AUX 059-systemd-executor.patch 1117 BLAKE2B 387d2b1b0c438fac43a73b789b9c095963fbd4e3c26ddc78323c6fac4d3be7c826cd86b5d058764dbcd6986c7b6c8f429389cd2804e194896f5d56cf5fb7d663 SHA512 a62354fdb414e3e6a9ebde16d3730e70c28b5a107f1d4034fb2db6d3a3c8ba16708e0ecaf581174d3ded00cf69316182400cd121451169f485a986c94a434710 +AUX 059-systemd-pcrphase.patch 3894 BLAKE2B 9ae145a617130f8f49780c87f0d487453e77e8ef2835edec06eafff60de6dd58d89d61124e36c962a68323bf167543b68e6985806cb856a9ef76e39170c2175d SHA512 5bab5bf04468da113aa9289ed37753921745d33867af558f3ca24253dbaf528cb5af495fda8e000c29f5fb4c4dcbc49ac9e2f8466f1d7c0f407301bd38165af8 AUX 059-uefi-split-usr.patch 1567 BLAKE2B 6abde1671c49e6314e181747ff504f50b7d6d1c9268f5f93a859edfdbbe823f48e33287dfa426b33f2dc967f1895d5499460e9bb865731e784a658d350ba7a3f SHA512 d1b27993003e5da1634a7e287a42ee0c4b8789a411024472e1b8b5a9923d94788dfe0bc4b48da9071bf62bb857aedbb18a5be7324e6d4c0919b329d85cc6b160 AUX 059-uki-systemd-254.patch 6162 BLAKE2B 60d7fdb8189d26d30fa92c8964e0b6a26b7cfab3d07f006fdad60582fcfbad4a7e9aed91eb9443eafd2f325be59224896ef7dbfa83170c8968aeccf290eeb093 SHA512 83462ef22148ce75b2a94f72c89af6a135d6f8b41fc64fe7d6db3553b409105f1a65eba84727e23c44e3cd61cbc66c132ca5a0f5c103ad974747145fac8c3070 AUX dracut-059-dmsquash-live.patch 936 BLAKE2B 6dcbc59561179bba5d7e998f901cda99d8deeeba15886c267e4f77033ab8308cf39b8aaa8ad4c99eca13b2689a052226fdbee6cdae370039bcf40f0e070a8c41 SHA512 34a1b34a09186fd05901f8114260170bf3a51cf96967aa58872c99d6bb1fb1673b8f0246171368837b88e0a1c83c5aac9c20e2f73ed88ed69df72362d55f911f @@ -10,6 +12,7 @@ DIST dracut-059.tar.gz 486487 BLAKE2B 86bbe18875cd3507e187b724cab212dc82e1daca7c DIST dracut-059_p20231027.tar.gz 491099 BLAKE2B 02c5de4577bc5fc87fd11b7b9760b0f1a4a83ed7ef1fc2de22ea3f9588e9b03b347c1be4f26965d26ab8b88736b0da70e01ecb4a50c2951d1ec4009222aaa97a SHA512 da26c798f8c3856f7b9488278f26f1f392e6f6e1863bd6bb590f940854cde6633a45cf60acf52a2a184a1a47250a23e6ee53cb3f5fa759eb0146a4c0d172c07e DIST dracut-060_pre20231030.tar.gz 498954 BLAKE2B ce47f06e1304f732cbad66046c70cbcb03d33d69b9c3e87a4e2e2d30fa837b3b36949462cec9b06125e824ad82db45bd7516c22a1c84ec6884790b37e9c65ab1 SHA512 0cd2fefcd624758063c77836989260a3d5b0d533004c2395124c8200c31602f5d7d0b8c9491de37ce4afb2c5009b2cf944ddd3bb9e0e11120d84176cb1e7423c EBUILD dracut-059-r5.ebuild 4427 BLAKE2B e9590a0dee49a29a39ce84891d43e73e44dce75718505b6f7f1303385a49b8093419f839890faace410a262579d3f698e24278fb6aaaa59cfdc11e19d50fad19 SHA512 59e12f230ca9f3fb3664375157576bd6b2a5f0834f0352d1434283690c2eaf92d130af6b2bc2f4f4600fba13e64601046b93639bc64744d1baae7abd39f4b9cd +EBUILD dracut-059-r6.ebuild 4519 BLAKE2B ec9c095274a8005ebcfaa5807cfac230869becc7788be94b28672deba9a04342f51f1acceb50fd5bba99433cb3f59f25ff2a3982c740963300b5c7951816580f SHA512 982f0fb05aa094e4209c87b24fa2abde5bbdd940c862f121c96322410ef824334db176311a1b1bdbff5913afba9acaf4d21cf5fa8984fcd582524a43bb45d591 EBUILD dracut-059_p20231027.ebuild 5193 BLAKE2B 7c1a94e341475f997fedd8d96536ae24626a177b8d6887a06ec0c6579e74f7ae8c4a98db6a7e4dd42708a422b2d939e73e505108ce3e0b09ddbc719ee8e18bb1 SHA512 4374b8529ebc6b7f2588666194a534a1bd5e53fc10ad7a3336b6ea0566510091afdb0f0bd947eb35dec165c90c48b5461197752f6c91bac70600461ff9c89b39 EBUILD dracut-060_pre20231030.ebuild 4284 BLAKE2B 3c3ba04fa9177c139bf1c4ade5eb0ad5afa68641e3f7a271384cf5495d3f97aff8ccd4888c55aac96e97f1bdbe3bcdfbbdb22688f1afe5b92c788229e0d0b9ad SHA512 7a50715c440256ad65b18d052a090cdb39dbe6e380d446fbde06bc842d7b84d54edec5d321d0f6df4520c4ea9c119fd32b879d7d741ec53d1ae1623bbb4b977d EBUILD dracut-9999.ebuild 4241 BLAKE2B 960b2050478f4845af6227c23c00060397443dce03b4080e932c1d17a1152a829f92959b6393b25a1f9768527490a496a06f7200f5b5a5938c3f92783210ff31 SHA512 271dfbc0ea9da92736ea2aec6eaa5102c108550da9060f50276411774bd141b942e419c403fd845308835dbcdac1297582ff059ddf4a61f459d29fb1fe84f0fc diff --git a/sys-kernel/dracut/dracut-059-r6.ebuild b/sys-kernel/dracut/dracut-059-r6.ebuild new file mode 100644 index 000000000000..4ef85771f79c --- /dev/null +++ b/sys-kernel/dracut/dracut-059-r6.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 optfeature systemd toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/dracutdevs/dracut" +else + if [[ "${PV}" != *_rc* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi + SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="https://github.com/dracutdevs/dracut/wiki" + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + app-arch/cpio + >=app-shells/bash-4.0:0 + sys-apps/coreutils[xattr(-)] + >=sys-apps/kmod-23[tools] + || ( + >=sys-apps/sysvinit-2.87-r3 + sys-apps/openrc[sysv-utils(-),selinux?] + sys-apps/systemd[sysv-utils] + sys-apps/s6-linux-init[sysv-utils(-)] + ) + >=sys-apps/util-linux-2.21 + virtual/pkgconfig + virtual/udev + + elibc_musl? ( sys-libs/fts-standalone ) + selinux? ( + sec-policy/selinux-dracut + sys-libs/libselinux + sys-libs/libsepol + ) +" +DEPEND=" + >=sys-apps/kmod-23 + elibc_musl? ( sys-libs/fts-standalone ) +" + +BDEPEND=" + app-text/asciidoc + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75.2 + >=dev-libs/libxslt-1.1.26 + virtual/pkgconfig +" + +QA_MULTILIB_PATHS="usr/lib/dracut/.*" + +PATCHES=( + "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch + "${FILESDIR}"/gentoo-network-r1.patch + "${FILESDIR}"/059-kernel-install-uki.patch + "${FILESDIR}"/059-uefi-split-usr.patch + "${FILESDIR}"/059-uki-systemd-254.patch + "${FILESDIR}"/059-gawk.patch + "${FILESDIR}"/dracut-059-dmsquash-live.patch + "${FILESDIR}"/059-systemd-pcrphase.patch + "${FILESDIR}"/059-systemd-executor.patch +) + +src_configure() { + local myconf=( + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc" + --bashcompletiondir="$(get_bashcompdir)" + --systemdsystemunitdir="$(systemd_get_systemunitdir)" + ) + + tc-export CC PKG_CONFIG + + echo ./configure "${myconf[@]}" + ./configure "${myconf[@]}" || die + + if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then + # Source tarball from github doesn't include this file + echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die + fi +} + +src_test() { + if [[ ${EUID} != 0 ]]; then + # Tests need root privileges, bug #298014 + ewarn "Skipping tests: Not running as root." + elif [[ ! -w /dev/kvm ]]; then + ewarn "Skipping tests: Unable to access /dev/kvm." + else + emake -C test check + fi +} + +src_install() { + local DOCS=( + AUTHORS + NEWS.md + README.md + docs/README.cross + docs/README.generic + docs/README.kernel + docs/SECURITY.md + ) + + default + + docinto html + dodoc dracut.html +} + +pkg_postinst() { + optfeature "Networking support" net-misc/networkmanager + optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ + sys-apps/iproute2 "net-misc/iputils[arping]" + optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs + optfeature "Load kernel modules and drop this privilege for real init" \ + sys-libs/libcap + optfeature "Support CIFS" net-fs/cifs-utils + optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ + "sys-fs/cryptsetup[-static-libs]" + optfeature "Support for GPG-encrypted keys for crypt module" \ + app-crypt/gnupg + optfeature \ + "Allows use of dash instead of default bash (on your own risk)" \ + app-shells/dash + optfeature \ + "Allows use of busybox instead of default bash (on your own risk)" \ + sys-apps/busybox + optfeature "Support iSCSI" sys-block/open-iscsi + optfeature "Support Logical Volume Manager" sys-fs/lvm2[lvm] + optfeature "Support MD devices, also known as software RAID devices" \ + sys-fs/mdadm sys-fs/dmraid + optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools + optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' + optfeature "Support network block devices" sys-block/nbd + optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind + optfeature \ + "Install ssh and scp along with config files and specified keys" \ + virtual/openssh + optfeature "Enable logging with rsyslog" app-admin/rsyslog + optfeature "Support Squashfs" sys-fs/squashfs-tools + optfeature "Support TPM 2.0 TSS" app-crypt/tpm2-tools + optfeature "Support Bluetooth (experimental)" net-wireless/bluez + optfeature "Support BIOS-given device names" sys-apps/biosdevname + optfeature "Support network NVMe" sys-apps/nvme-cli + optfeature \ + "Enable rngd service to help generating entropy early during boot" \ + sys-apps/rng-tools +} diff --git a/sys-kernel/dracut/files/059-systemd-executor.patch b/sys-kernel/dracut/files/059-systemd-executor.patch new file mode 100644 index 000000000000..5ec1a1386136 --- /dev/null +++ b/sys-kernel/dracut/files/059-systemd-executor.patch @@ -0,0 +1,31 @@ +From bee1c4824a8cd47ce6c01892a548bdc07b1fa678 Mon Sep 17 00:00:00 2001 +From: Frantisek Sumsal +Date: Sat, 14 Oct 2023 23:45:57 +0200 +Subject: [PATCH] feat(systemd): install systemd-executor + +In [0] systemd gained a new binary - systemd-executor - that's used to +spawn processes forked off systemd. Let's copy it into the initrd if +it's available. + +[0] https://github.com/systemd/systemd/pull/27890 + +Signed-off-by: Brian Harring +--- + modules.d/00systemd/module-setup.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh +index 554c25a08..9a13a1dbb 100755 +--- a/modules.d/00systemd/module-setup.sh ++++ b/modules.d/00systemd/module-setup.sh +@@ -34,6 +34,7 @@ install() { + "$systemdutildir"/systemd \ + "$systemdutildir"/systemd-coredump \ + "$systemdutildir"/systemd-cgroups-agent \ ++ "$systemdutildir"/systemd-executor \ + "$systemdutildir"/systemd-shutdown \ + "$systemdutildir"/systemd-reply-password \ + "$systemdutildir"/systemd-fsck \ +-- +2.41.0 + diff --git a/sys-kernel/dracut/files/059-systemd-pcrphase.patch b/sys-kernel/dracut/files/059-systemd-pcrphase.patch new file mode 100644 index 000000000000..f653cdd5907e --- /dev/null +++ b/sys-kernel/dracut/files/059-systemd-pcrphase.patch @@ -0,0 +1,91 @@ +https://github.com/dracutdevs/dracut/pull/2586 + +From cd6f683d634970112a29867137431d0d57f8c957 Mon Sep 17 00:00:00 2001 +From: Antonio Alvarez Feijoo +Date: Thu, 9 Feb 2023 13:55:47 +0100 +Subject: [PATCH] fix(systemd-pcrphase): only include + systemd-pcrphase-initrd.service + +The only systemd-pcrphase related unit configured to run in the initrd is +systemd-pcrphase-initrd.service. +Both systemd-pcrphase.service and systemd-pcrphase-sysinit.service contain +`ConditionPathExists=!/etc/initrd-release`. + +Signed-off-by: Brian Harring +--- + modules.d/01systemd-pcrphase/module-setup.sh | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/modules.d/01systemd-pcrphase/module-setup.sh b/modules.d/01systemd-pcrphase/module-setup.sh +index 3dbb4974..fa960a42 100755 +--- a/modules.d/01systemd-pcrphase/module-setup.sh ++++ b/modules.d/01systemd-pcrphase/module-setup.sh +@@ -28,10 +28,6 @@ install() { + + inst_multiple -o \ + "$systemdutildir"/systemd-pcrphase \ +- "$systemdsystemunitdir"/systemd-pcrphase.service \ +- "$systemdsystemunitdir/systemd-pcrphase.service.d/*.conf" \ +- "$systemdsystemunitdir"/systemd-pcrphase-sysinit.service \ +- "$systemdsystemunitdir/systemd-pcrphase-sysinit.service/*.conf" \ + "$systemdsystemunitdir"/systemd-pcrphase-initrd.service \ + "$systemdsystemunitdir/systemd-pcrphase-initrd.service.d/*.conf" \ + "$systemdsystemunitdir"/initrd.target.wants/systemd-pcrphase-initrd.service +@@ -39,10 +35,6 @@ install() { + # Install the hosts local user configurations if enabled. + if [[ $hostonly ]]; then + inst_multiple -H -o \ +- "$systemdsystemconfdir"/systemd-pcrphase.service \ +- "$systemdsystemconfdir/systemd-pcrphase.service.d/*.conf" \ +- "$systemdsystemconfdir"/systemd-pcrphase-sysinit.service \ +- "$systemdsystemconfdir/systemd-pcrphase-sysinit.service.d/*.conf" \ + "$systemdsystemconfdir"/systemd-pcrphase-initrd.service \ + "$systemdsystemconfdir/systemd-pcrphase-initrd.service.d/*.conf" \ + "$systemdsystemconfdir"/initrd.target.wants/systemd-pcrphase-initrd.service +-- +2.41.0 + +From cd93aaa2e096a8cbd1f1789dcce06857067b35c9 Mon Sep 17 00:00:00 2001 +From: Brian Harring +Date: Mon, 11 Dec 2023 17:10:20 -0800 +Subject: [PATCH] fix(systemd-255): handle systemd-pcr{phase -> extend} rename + +The binary systemd-pcrphase was renamed to systemd-pcrextend +in systemd 255, but the backing units were all left named +systemd-pcrphase. + +Fixes: #2583 + +Signed-off-by: Brian Harring +--- + modules.d/01systemd-pcrphase/module-setup.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/modules.d/01systemd-pcrphase/module-setup.sh b/modules.d/01systemd-pcrphase/module-setup.sh +index fa960a42c..87efd0c1a 100755 +--- a/modules.d/01systemd-pcrphase/module-setup.sh ++++ b/modules.d/01systemd-pcrphase/module-setup.sh +@@ -6,7 +6,11 @@ + check() { + + # If the binary(s) requirements are not fulfilled the module can't be installed. +- require_binaries "$systemdutildir"/systemd-pcrphase || return 1 ++ # systemd-255 renamed the binary, check for old and new location. ++ if ! require_binaries "$systemdutildir"/systemd-pcrphase && \ ++ ! require_binaries "$systemdutildir"/systemd-pcrextend; then ++ return 1 ++ fi + + # Return 255 to only include the module, if another module requires it. + return 255 +@@ -28,6 +32,7 @@ install() { + + inst_multiple -o \ + "$systemdutildir"/systemd-pcrphase \ ++ "$systemdutildir"/systemd-pcrextend \ + "$systemdsystemunitdir"/systemd-pcrphase-initrd.service \ + "$systemdsystemunitdir/systemd-pcrphase-initrd.service.d/*.conf" \ + "$systemdsystemunitdir"/initrd.target.wants/systemd-pcrphase-initrd.service +-- +2.41.0 + -- cgit v1.2.3