From 16857b69f990738d17bc5842e3e49a6e82d1428d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 Jul 2024 12:28:32 +0100 Subject: gentoo auto-resync : 17:07:2024 - 12:28:31 --- sys-kernel/dracut/Manifest | 3 +- sys-kernel/dracut/dracut-103-r1.ebuild | 154 +++++++++++++++++++++ sys-kernel/dracut/dracut-103.ebuild | 152 -------------------- .../files/dracut-103-systemd-udev-256-kmod.patch | 41 ++++++ 4 files changed, 197 insertions(+), 153 deletions(-) create mode 100644 sys-kernel/dracut/dracut-103-r1.ebuild delete mode 100644 sys-kernel/dracut/dracut-103.ebuild create mode 100644 sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch (limited to 'sys-kernel/dracut') diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index d0dac5965ff8..f824ce58da48 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -10,6 +10,7 @@ AUX dracut-060-fix-resume-hostonly.patch 2670 BLAKE2B fc86da8dd8152c9d50480e302f AUX dracut-060-grub-layout.patch 1390 BLAKE2B a12a11dbbab0dc68bed954e154ae708ac7b2c2bdf56017278a6babd72ea532fc9bf0d00e7193dfaf2415daf6cfffea2ab119796136342997ec1ff251f5cbace1 SHA512 e6a54694c452dd4b8e053be004cb0f4011b2322580b3b72f1c59c689170de0bb7f14e87f581a0ebe5465c5beb5efcff33736c6c02003afdcf39db0aed2684d7a AUX dracut-060-systemd-255.patch 1185 BLAKE2B 8198736b5f48ed20712de40088d8c86ec6f4e3637f97a69273218257e9570e1924cb00270550f6f5314644cadc73c03377ffe6da69c83c8d8ac7aabaf62807c3 SHA512 f4f50edb2be4b4c3ab4e85c262d54da7eb20234ede8d7fd0236a4a92e11302b5f65295d8ab1d3fa56f50c01b144de51aa5818b7214c1929bc06e99068c85b845 AUX dracut-103-acct-user-group-gentoo.patch 915 BLAKE2B 75747b3775d04dd777d2a0f61116bbb83784b1a58656655ee6b441e79d1dc8e35a940dfbb0d4018ff27ba80c0581949d98326ebbc6804348004546a2ee1285ed SHA512 e6b4115a6121289a4ec814ddf4e4394f64096b298c3ab6393e197b19235ff494258478d8d74b9dfc570b122cc2122375b24c088a037b0ebf2ac5d9f6a54dcb67 +AUX dracut-103-systemd-udev-256-kmod.patch 1616 BLAKE2B f1c15c4cd57d947f92f286c1fd9a4b045837017e965aa9b2707a15dea4426b0c349ad65e53f0b6a6e4dc7ddc999773a1af161cac2eac724d047a8d3109a8aeaa SHA512 359dfc2ee79d7647676c2b343f1b4bc23f11bc296c6b6c9be1525f87965be1ee8d4105f25dc6dc39dcdbca7a0d229a704a11416e7757739159493c6dc930f182 AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f AUX gentoo-network-r1.patch 1002 BLAKE2B 719ff76c315e29c2a40f0a485e315622d6678ef0a325681af22ca060189649119ce08024b1b81be02b28cf532d33165918f5707742bb9927abd08ce49ee0565d SHA512 694f493384e2c0b6a46508f2290efca78d1b6f742fe8441f970837280558d160a711e36ba835ca767cfd158bf191856017af146ae19c5aa1aecbd10a69be38a1 DIST dracut-059.tar.gz 486487 BLAKE2B 86bbe18875cd3507e187b724cab212dc82e1daca7cedf79aeef13c34601adfff72bf2c0ba4c652e715b43c9a16f7be6a4a2b29dc75bef014640e1ec07c8d455b SHA512 196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af36d109214dc4a10b2dc2d3bd19e844f7f51c2bdec087e064ea11f75124032d @@ -23,6 +24,6 @@ EBUILD dracut-060_pre20231030-r2.ebuild 4532 BLAKE2B 1103591973694d6378c40d178c8 EBUILD dracut-060_pre20240104-r4.ebuild 4588 BLAKE2B 3d5d1925b02c4e1c1fe1376ad5b768a529494951712477754be7c2e2c79cbbf82644416cffb424a24ed5dc307e74bc7ccddf3ad7bd3b01db6349f39f5bec8206 SHA512 a802d9400eb92bb7680f37488bb415b314874025713a4d2e66b6e535ee8201c3ec8ad6b7275faf94527f624bab45c93bfa8e37937573f76fe1df20dcfcdf9e39 EBUILD dracut-101.ebuild 4227 BLAKE2B 71df1586c8b1f5083f488e2be6bbbf6f100ab84998249f5e45957cc7e8bd6550279e128e62a642c58b0f23105505b4fa8f1ea2b5782c4f0e91ba7aa52f72ff20 SHA512 4ced480b7f3b94e51e985dc82790391ce1aea00424fc9fbf909a13a28bf3e8923665815f63665a56565cdf43dc6c5bbfe0a379b2db22066b6ea32efe0450f91c EBUILD dracut-102.ebuild 4196 BLAKE2B f28e14333cace273365b3c718e3c690a19c18dec11a35bb397b5bcf0001cbbef89247a0bdc052f1116d85c8381c44ffd2cf1024e037051cd4bb67da423457810 SHA512 4ca5795989f6b6ae773df95f46c84ac94852f6b48e046ceeff7129cf6577a79b13abbfe47c343db98717fb1222245eaa11962f882cf3cbed173dcacedcd8b0e3 -EBUILD dracut-103.ebuild 4311 BLAKE2B cc657042991984fdb95c3c74bb0bb300c9b8b2bb28ea720f4121420809f7b4ecb2a2189b49a83d197f78d3620b1af503eec328b05bd7b31d7028153f1d95fa90 SHA512 d4b35bbcf5dce206514a4593359ba70b7e6315c17d6bd97893d3ec0a9a8f015156dcd8752e3dfa80ab46b7cd2dda4021f66ff310fa391e2afd0ed495e0e306aa +EBUILD dracut-103-r1.ebuild 4415 BLAKE2B acd6eb4bf115913cfecef80e5e1d0093f37ca43883e9b803d13e39b5b17bd39f03fae312dbe2f335e926839490a347c310c5938830bd86742414313e88007965 SHA512 12b8204189a81bee9d5c1711cd00fd84b4f99ab7eca3ea736fb893cf5ddc2d38168d95e1a92ab4c6f996ec6ea6f6fab2fd440fff7204b1a21a33b7696943a0f9 EBUILD dracut-9999.ebuild 4311 BLAKE2B cc657042991984fdb95c3c74bb0bb300c9b8b2bb28ea720f4121420809f7b4ecb2a2189b49a83d197f78d3620b1af503eec328b05bd7b31d7028153f1d95fa90 SHA512 d4b35bbcf5dce206514a4593359ba70b7e6315c17d6bd97893d3ec0a9a8f015156dcd8752e3dfa80ab46b7cd2dda4021f66ff310fa391e2afd0ed495e0e306aa MISC metadata.xml 572 BLAKE2B a1f308c046673cc7acfc4c74cb78b8fd24527241eec46193004ac64fdd17f325eab761b19fdd5428071f4db6e7c1cc27ccaedd89a2724adc6226dd7e96f3714f SHA512 651ea5de77053dbb2b172e3f2a8d8e2d57957bfb726ef78801091f9f1c7c03fde9fe086cd28e94e2e6102b9a2e99f32cb84a6150b4f6b2b6a9cadae3856bad29 diff --git a/sys-kernel/dracut/dracut-103-r1.ebuild b/sys-kernel/dracut/dracut-103-r1.ebuild new file mode 100644 index 000000000000..7b5110a6f58d --- /dev/null +++ b/sys-kernel/dracut/dracut-103-r1.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 edo optfeature systemd toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng" +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/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-ng-${PV}" +fi + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki" + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux test" +RESTRICT="!test? ( test )" + +RDEPEND=" + app-alternatives/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[native-symlinks(+)] + 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 + # Gentoo specific acct-user and acct-group conf adjustments + "${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch + # https://github.com/dracut-ng/dracut-ng/pull/507 + "${FILESDIR}"/${PN}-103-systemd-udev-256-kmod.patch +) + +src_configure() { + local myconf=( + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc" + --bashcompletiondir="$(get_bashcompdir)" + --systemdsystemunitdir="$(systemd_get_systemunitdir)" + ) + + tc-export CC PKG_CONFIG + + edo ./configure "${myconf[@]}" +} + +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/HACKING.md + docs/README.cross + docs/README.kernel + docs/RELEASE.md + 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 app-misc/jq + optfeature \ + "Enable rngd service to help generating entropy early during boot" \ + sys-apps/rng-tools + optfeature "automatically generating an initramfs on each kernel installation" \ + "sys-kernel/installkernel[dracut]" +} diff --git a/sys-kernel/dracut/dracut-103.ebuild b/sys-kernel/dracut/dracut-103.ebuild deleted file mode 100644 index 02a959fa286d..000000000000 --- a/sys-kernel/dracut/dracut-103.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 edo optfeature systemd toolchain-funcs - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng" -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/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-ng-${PV}" -fi - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki" - -LICENSE="GPL-2" -SLOT="0" -IUSE="selinux test" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-alternatives/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[native-symlinks(+)] - 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 - # Gentoo specific acct-user and acct-group conf adjustments - "${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch -) - -src_configure() { - local myconf=( - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc" - --bashcompletiondir="$(get_bashcompdir)" - --systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - tc-export CC PKG_CONFIG - - edo ./configure "${myconf[@]}" -} - -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/HACKING.md - docs/README.cross - docs/README.kernel - docs/RELEASE.md - 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 app-misc/jq - optfeature \ - "Enable rngd service to help generating entropy early during boot" \ - sys-apps/rng-tools - optfeature "automatically generating an initramfs on each kernel installation" \ - "sys-kernel/installkernel[dracut]" -} diff --git a/sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch b/sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch new file mode 100644 index 000000000000..7a1fc1c8daf3 --- /dev/null +++ b/sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch @@ -0,0 +1,41 @@ +From e16195f28669264227c169d45107ea95b83d8f48 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Tue, 16 Jul 2024 08:48:54 +0300 +Subject: [PATCH] fix(systemd): move installation of libkmod to udev-rules + module + +libkmod library should be installed even if systemd module is +omitted, so move its installation to udev-rules module. +--- + modules.d/00systemd/module-setup.sh | 1 - + modules.d/95udev-rules/module-setup.sh | 6 +++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh +index ce7bb520c..e4fb9a586 100755 +--- a/modules.d/00systemd/module-setup.sh ++++ b/modules.d/00systemd/module-setup.sh +@@ -171,6 +171,5 @@ EOF + _arch=${DRACUT_ARCH:-$(uname -m)} + inst_libdir_file \ + {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \ +- {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \ + {"tls/$_arch/",tls/,"$_arch/",}"libnss_*" + } +diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh +index d82ed5eb9..6078751f6 100755 +--- a/modules.d/95udev-rules/module-setup.sh ++++ b/modules.d/95udev-rules/module-setup.sh +@@ -93,7 +93,11 @@ install() { + "${udevdir}"/usb_id \ + "${udevdir}"/v4l_id + +- inst_libdir_file "libnss_files*" ++ # Install required libraries. ++ _arch=${DRACUT_ARCH:-$(uname -m)} ++ inst_libdir_file \ ++ {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \ ++ {"tls/$_arch/",tls/,"$_arch/",}"libnss_files*" + + # Install the hosts local user configurations if enabled. + if [[ $hostonly ]]; then -- cgit v1.2.3