diff options
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/Manifest.gz | bin | 4737 -> 4737 bytes | |||
| -rw-r--r-- | sys-kernel/dracut/Manifest | 7 | ||||
| -rw-r--r-- | sys-kernel/dracut/dracut-103.ebuild | 152 | ||||
| -rw-r--r-- | sys-kernel/dracut/dracut-9999.ebuild | 2 | ||||
| -rw-r--r-- | sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch | 30 | ||||
| -rw-r--r-- | sys-kernel/dracut/metadata.xml | 4 |
6 files changed, 193 insertions, 2 deletions
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz Binary files differindex 2c9da164ae60..1918dae91771 100644 --- a/sys-kernel/Manifest.gz +++ b/sys-kernel/Manifest.gz diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 2a8259076c99..d0dac5965ff8 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -9,6 +9,7 @@ AUX dracut-059-install-new-systemd-hibernate-resume.service.patch 1048 BLAKE2B e AUX dracut-060-fix-resume-hostonly.patch 2670 BLAKE2B fc86da8dd8152c9d50480e302f06903bc0595449a12dbe2b8b34438df767284b0f7947b8d962312c1feb16ebd5fe0749f77191b0a22f42a4bfc0b12373be96be SHA512 d3bc3b1d5d3b71647846288b84b7b3dd8f8a1c0d2279a9373cd462202c82bc7d20e5eca585e2ae70f60fa93d8835ff3ec791a510b54b03e9b147d94068cd9663 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 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 @@ -16,10 +17,12 @@ DIST dracut-060_pre20231030.tar.gz 498954 BLAKE2B ce47f06e1304f732cbad66046c70cb DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e DIST dracut-101.tar.gz 556673 BLAKE2B 8780451aeafd3d9fdfcabc8eb077bb44cc6d64d69cd3138e7447985fcf225495caea937269cf4f0a09a10a6ce2202cc10e817777090aac0bb207fec99e1c8bc8 SHA512 827f073b749a374b703f317ba249479312043ed54af82609ce45332c27349870a68a1d9883118e0a3ecd1cbb33d64aca8bcf6aac56eb75f721fd3380bd12005b DIST dracut-102.tar.gz 559538 BLAKE2B 665f1313c71269856b8e5fd540ecf645844ed196d705122752c9577a00a30e91ad8ce4b3336f49507381e78d381e4b5b9982217cc496200b1c97692fa5c6aea9 SHA512 463ad75f0508392431d58796763a41accf5a1dc17fe27d36e37d588153ca9c5b32b453faa9149524ea2dc2906805126d1e023feecb6554206595a972508f6a32 +DIST dracut-103.tar.gz 567713 BLAKE2B 7781c0b7fc83a2c0c461f6398687e053226b489fb5405b3132b30d8e7a4f3cea2bb73aa0fe6e4c4b27187d6270ba623f403916ec38025a912930ae347a7e25ce SHA512 ba0dbefbcbecb09c44ce240664bc4f4ee25dfb8be7bc060028ae3b1ccf7d70410491c105e64fcef3d6f44d2794cb6162bcea9404125906be46bf3dff098e0277 EBUILD dracut-059-r7.ebuild 4715 BLAKE2B 119097a741c83262e2041e215f5c8d78d897901b07a1c93deccff48e6f750f44a702b769a88088e332ae1289a1e95cad866fc305c2a6b9e6e3d3b0003de3ccc9 SHA512 e8ccab043299e5c542809ba7154c2bd9712fd055e4dd085c6c325c66b49526423dc576b97ea1849cdc79440fb8e91ff5a86c6d339e48bc0560ea4b68c1fb84a2 EBUILD dracut-060_pre20231030-r2.ebuild 4532 BLAKE2B 1103591973694d6378c40d178c8b217d5babb1c385256bc7ca8929ab27e2456f7557e5d007590b38dbcf57a1811e4a4a3b5e6045f1664400dd21e0139c25285a SHA512 a0a1dfabc22cbbb62c33a8ff3ca4852fdf793cc54b5d368e07dd4f42fb0bb169aa072c3a0dd429c0ea9c70f5c915592ba736dc61d5c88d35713122fbfa1d4b47 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-9999.ebuild 4196 BLAKE2B f28e14333cace273365b3c718e3c690a19c18dec11a35bb397b5bcf0001cbbef89247a0bdc052f1116d85c8381c44ffd2cf1024e037051cd4bb67da423457810 SHA512 4ca5795989f6b6ae773df95f46c84ac94852f6b48e046ceeff7129cf6577a79b13abbfe47c343db98717fb1222245eaa11962f882cf3cbed173dcacedcd8b0e3 -MISC metadata.xml 453 BLAKE2B a8a98339a3f16f0a6f77e578aa2a2d363ea72eb5ddbf930291e31f4934416d4d653aeba87f5f6074b7911b26234f564d1430c5bf841c0a47e2bf803d185aaafa SHA512 e8f095b275cdfaf44f41d746dd7b1e8d1fb093c8cf9cd933d609215a5df054767c21125214216a2c20a0e8bf2ff43276215d09316aa560cc33d50943bc04670c +EBUILD dracut-103.ebuild 4311 BLAKE2B cc657042991984fdb95c3c74bb0bb300c9b8b2bb28ea720f4121420809f7b4ecb2a2189b49a83d197f78d3620b1af503eec328b05bd7b31d7028153f1d95fa90 SHA512 d4b35bbcf5dce206514a4593359ba70b7e6315c17d6bd97893d3ec0a9a8f015156dcd8752e3dfa80ab46b7cd2dda4021f66ff310fa391e2afd0ed495e0e306aa +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.ebuild b/sys-kernel/dracut/dracut-103.ebuild new file mode 100644 index 000000000000..02a959fa286d --- /dev/null +++ b/sys-kernel/dracut/dracut-103.ebuild @@ -0,0 +1,152 @@ +# 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/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 76bce478b715..02a959fa286d 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -63,6 +63,8 @@ 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() { diff --git a/sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch b/sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch new file mode 100644 index 000000000000..045528bb0c45 --- /dev/null +++ b/sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch @@ -0,0 +1,30 @@ +diff --git a/dracut-init.sh b/dracut-init.sh +index 986da96b..bd47bc92 100755 +--- a/dracut-init.sh ++++ b/dracut-init.sh +@@ -711,10 +711,10 @@ inst_libdir_file() { + + # install sysusers files + inst_sysusers() { +- inst_multiple -o "$sysusers/$*" ++ inst_multiple -o "$sysusers/acct-*-$*" + + if [[ $hostonly ]]; then +- inst_multiple -H -o "$sysusersconfdir/$*" ++ inst_multiple -H -o "$sysusersconfdir/acct-*-$*" + fi + } + +diff --git a/modules.d/91tpm2-tss/module-setup.sh b/modules.d/91tpm2-tss/module-setup.sh +index 4441f552..4b5654d5 100755 +--- a/modules.d/91tpm2-tss/module-setup.sh ++++ b/modules.d/91tpm2-tss/module-setup.sh +@@ -30,7 +30,7 @@ installkernel() { + + # Install the required file(s) and directories for the module in the initramfs. + install() { +- inst_sysusers tpm2-tss.conf ++ inst_sysusers tss.conf + + inst_multiple -o \ + "$tmpfilesdir"/tpm2-tss-fapi.conf \ diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml index 09753297dd20..2fcbcf06bc84 100644 --- a/sys-kernel/dracut/metadata.xml +++ b/sys-kernel/dracut/metadata.xml @@ -9,6 +9,10 @@ <email>floppym@gentoo.org</email> <name>Mike Gilbert</name> </maintainer> + <maintainer type="person"> + <email>andrewammerlaan@gentoo.org</email> + <name>Andrew Ammerlaan</name> + </maintainer> <upstream> <remote-id type="github">dracut-ng/dracut-ng</remote-id> </upstream> |