diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-01-15 13:18:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-15 13:18:00 +0000 |
commit | b9d13f23ed10bb803607f6ef67f0df2f078aa70f (patch) | |
tree | 6ff7cd69abb13870927f740d32794bde212eefe7 /sys-kernel/dracut | |
parent | 804e8874f39a664f97becd43e96d0cced9c58d50 (diff) |
gentoo auto-resync : 15:01:2024 - 13:18:00
Diffstat (limited to 'sys-kernel/dracut')
-rw-r--r-- | sys-kernel/dracut/Manifest | 3 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-060_pre20240104.ebuild | 156 | ||||
-rw-r--r-- | sys-kernel/dracut/files/dracut-060-grub-layout.patch | 22 |
3 files changed, 181 insertions, 0 deletions
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 317706616033..5a9c62b74cb3 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -7,17 +7,20 @@ AUX 059-uki-systemd-254.patch 6162 BLAKE2B 60d7fdb8189d26d30fa92c8964e0b6a26b7cf AUX dracut-059-dmsquash-live.patch 936 BLAKE2B 6dcbc59561179bba5d7e998f901cda99d8deeeba15886c267e4f77033ab8308cf39b8aaa8ad4c99eca13b2689a052226fdbee6cdae370039bcf40f0e070a8c41 SHA512 34a1b34a09186fd05901f8114260170bf3a51cf96967aa58872c99d6bb1fb1673b8f0246171368837b88e0a1c83c5aac9c20e2f73ed88ed69df72362d55f911f AUX dracut-059-install-new-systemd-hibernate-resume.service.patch 1048 BLAKE2B e2b2e2f8c92aa9ae42ce93e2423ffd30642caf05267faee84d02c7200527dd4bd1f31c76739f607d21d9799a69d68efa8457caed980efdf614151a454ed0fb3e SHA512 2ddfd57d8cca3b4564de6207471a47201edb13f9ba5598333874b976e1710e6e8fae910c35d7cf679dc023c82ec9aafad190b3953b0e73000e3531e9963a913f AUX dracut-060-fix-resume-hostonly.patch 2670 BLAKE2B fc86da8dd8152c9d50480e302f06903bc0595449a12dbe2b8b34438df767284b0f7947b8d962312c1feb16ebd5fe0749f77191b0a22f42a4bfc0b12373be96be SHA512 d3bc3b1d5d3b71647846288b84b7b3dd8f8a1c0d2279a9373cd462202c82bc7d20e5eca585e2ae70f60fa93d8835ff3ec791a510b54b03e9b147d94068cd9663 +AUX dracut-060-grub-layout.patch 1155 BLAKE2B 3efbc0e34beb777f407907176fc5e567b95c78395410c756f00370d2db8f694c39f1eb20eeacb3b428676f4d8b1591f72a3d1c7893cf68d36ef39d8e0bf2b13e SHA512 2d4ffe6815b8bd38a7f5f5d037630f0bd69c8da4152098b07825daea775efbdbbc89afdf7cd01edce613ca347b5246b526808e17cc279baaa51ba09c580114a7 AUX dracut-060-systemd-255.patch 1185 BLAKE2B 8198736b5f48ed20712de40088d8c86ec6f4e3637f97a69273218257e9570e1924cb00270550f6f5314644cadc73c03377ffe6da69c83c8d8ac7aabaf62807c3 SHA512 f4f50edb2be4b4c3ab4e85c262d54da7eb20234ede8d7fd0236a4a92e11302b5f65295d8ab1d3fa56f50c01b144de51aa5818b7214c1929bc06e99068c85b845 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 DIST dracut-059_p20231027.tar.gz 491099 BLAKE2B 02c5de4577bc5fc87fd11b7b9760b0f1a4a83ed7ef1fc2de22ea3f9588e9b03b347c1be4f26965d26ab8b88736b0da70e01ecb4a50c2951d1ec4009222aaa97a SHA512 da26c798f8c3856f7b9488278f26f1f392e6f6e1863bd6bb590f940854cde6633a45cf60acf52a2a184a1a47250a23e6ee53cb3f5fa759eb0146a4c0d172c07e DIST dracut-060_pre20231030.tar.gz 498954 BLAKE2B ce47f06e1304f732cbad66046c70cbcb03d33d69b9c3e87a4e2e2d30fa837b3b36949462cec9b06125e824ad82db45bd7516c22a1c84ec6884790b37e9c65ab1 SHA512 0cd2fefcd624758063c77836989260a3d5b0d533004c2395124c8200c31602f5d7d0b8c9491de37ce4afb2c5009b2cf944ddd3bb9e0e11120d84176cb1e7423c +DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e EBUILD dracut-059-r5.ebuild 4435 BLAKE2B 45cdc8a9e018fca312ad9c116852f42f98c74841de14904bd23d4e7ee0465bebf312bd2e28d8f134cfced60da2ee964c343f4eb1423bf59be62958204acf568d SHA512 acf603add4b43c632b384dc9394283840c478408acf428d97eb1a2631391ad15bdf3a3370c4a6bcf451f7bbe2756c08e76005893b8de4077f73dbec55f59ea92 EBUILD dracut-059-r6.ebuild 4527 BLAKE2B 04b41635fd79d09c07b4ec2f22750d9e30a766c04bee015adb6de09ed4f3d48d6d4836cea28af863f137428958cd146b4b104399600abcccc4ae5505ee48b66a SHA512 cf03c5bd6bbecc5985eecdca1cbe438636fe4fd61ec1f57e4c85d000f5ce95a9196d664fa2919880caa0c2fa6681e45d731727087e553641a111c569800354ba EBUILD dracut-059-r7.ebuild 4597 BLAKE2B d2f555365b661d0b199e25370c6177355399c12bc7a5791243ac0d7ca05a3cd3b300b2c3a0f09c1a81103c0f8ce9d25198499bedb44341445df13d91ad4ce325 SHA512 7091ce0a1bb015b31dbab17af8428693fc84626c07e40048f635c09088e64467d7df1d09e74bf06ec52fd15cacc27e4ac3989ff74081e3e7f4b05d50f207abf9 EBUILD dracut-059_p20231027.ebuild 5201 BLAKE2B b9d7564e4afbf25050367e16c3117482d1fa3188661ba85691c6c55b37d37c699dba09dade1fb8aaef32d9832b846961b00a15a1ca022782ba7a86b164581835 SHA512 90d83223fb5c67cbdd5641c7c57c58699beab315ad531d51c556cc6518ae4265471cc92b6027b08ffc22e94711e7410cd879ffeaf8089a2af139e319d30c57e4 EBUILD dracut-060_pre20231030-r1.ebuild 4336 BLAKE2B 9486ec725290f5483237b48ca9eabc59a0a211f1d70dd4f8ceca4413c8e5bacf838afec959320791f5114846f72954a4df2d4ddcd88930c48e3d468bc6d95b46 SHA512 a3ac8cd5ee7f576a675de1770dd4b9046ac2f7906c1deeeff31bf281bb517aa5ecc857708527c47f354a3594662d1ba03ff26ba3c8ecf7489035b92293859db8 EBUILD dracut-060_pre20231030-r2.ebuild 4413 BLAKE2B 929a215594fd5813bbd35e2fcaa5096ab972b86e534b0597e297ced93a431148774b1212942c2ff662440089eb37b9ec55271c7766f0c8b18f5785b1c534622f SHA512 d21a0cf8234b93e5f8a370f6ceae45dc661b56b89a6bd9a552a8a2133d72897bfe581565916fb5797f0cd558f852c8eeca7e0c705a001b08a9b2f3714d1cd4e0 +EBUILD dracut-060_pre20240104.ebuild 4457 BLAKE2B 39b04c82daa0d08502770de08d8d6cbdeda77a788e6ab672c511182cc084fde654fde5cc1d8abeb2b103f99f287c5bc7637ce410289d140233752c5010997008 SHA512 89e153688cc6013994e19394d50f7b73b2f69e7ddd16f5e7cce84a08380a527e082ebc7463f9d1d8107db486eeb345524017d137dde4f30e93486bcd20af79e3 EBUILD dracut-9999.ebuild 4249 BLAKE2B 651c02e56185b4e1fef8baa4920c4587ae50bcbd27451b1f8845ff08e630ddb3f70ed9508315222774bfde955957bb0c8589591de22da586691ac645e62fbf7a SHA512 b0d6c157c25783dd19901537df780a7aa2da421559477d15b4ed648a3cacd7fbe7df4e70b3b97bcd64d8f4b114fad9bbb2b544c0bb35914139bd9b8c965783d3 MISC metadata.xml 451 BLAKE2B 34fe004c76ad1ec98a27c53451f51a15689bda1413bb1dae895d4e7be68d810388cbf46d739b04da3b7869835eb70c1b9c03957d60fc6217b12bc028bd011b40 SHA512 51c81f853ab1be8d8dc240d69b1b2c9c69992efa804a394246222466d774bf673f0cb32031d46a56fc2628cd148b0a5c733a8690b78bff70806ca7f563a2855a diff --git a/sys-kernel/dracut/dracut-060_pre20240104.ebuild b/sys-kernel/dracut/dracut-060_pre20240104.ebuild new file mode 100644 index 000000000000..2cb041b55c0f --- /dev/null +++ b/sys-kernel/dracut/dracut-060_pre20240104.ebuild @@ -0,0 +1,156 @@ +# 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/dracutdevs/dracut" +else + if [[ ${PV} == *_p* ]] ; then + EGIT_COMMIT="4980bad34775da715a2639b736cba5e65a8a2604" + SRC_URI="https://github.com/dracutdevs/dracut/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/${PN}-${EGIT_COMMIT} + else + SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + fi +fi + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="https://github.com/dracutdevs/dracut/wiki" + +LICENSE="GPL-2" +SLOT="0" +if [[ "${PV}" != *_rc* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +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 + 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}"/dracut-060-fix-resume-hostonly.patch + "${FILESDIR}"/dracut-060-grub-layout.patch + "${FILESDIR}"/dracut-060-systemd-255.patch + "${FILESDIR}"/dracut-059-install-new-systemd-hibernate-resume.service.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/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 app-misc/jq + optfeature \ + "Enable rngd service to help generating entropy early during boot" \ + sys-apps/rng-tools +} diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch b/sys-kernel/dracut/files/dracut-060-grub-layout.patch new file mode 100644 index 000000000000..5d8e9a9fcf9d --- /dev/null +++ b/sys-kernel/dracut/files/dracut-060-grub-layout.patch @@ -0,0 +1,22 @@ +Ensures that the generated initrd is installed in the "new" way via the +staging area in the grub layout. This prevents accidentally creating +an UKI named initrd, and also ensures that BOOT_ROOT and +KERNEL_INSTALL_INITRD_GENERATOR are respected when the layout is set to grub. + +Downstream only since the grub layout for using grub with systemd's +kernel-install is not supported by systemd upstream and therefore this +patch is unlikely to be accepted by dracut upstream. + +diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install +index 441414a..cfd4fe7 100755 +--- a/install.d/50-dracut.install ++++ b/install.d/50-dracut.install +@@ -30,7 +30,7 @@ if [[ $KERNEL_INSTALL_LAYOUT == "uki" && -n $KERNEL_INSTALL_STAGING_AREA ]]; the + else + exit 0 + fi +-elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then ++elif [[ $KERNEL_INSTALL_LAYOUT == "bls" || $KERNEL_INSTALL_LAYOUT == "grub" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then + BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA" + if [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then + IMAGE="initrd" |