diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index c16b255..f337920 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,9 +1,11 @@ AUX 053-network-manager.patch 840 BLAKE2B d9dca01ad97015d636dfda3eb2b99a9289dabbc2554ea79159f6e971ab0baa912d21866204d91b4e6cdf9f8f5d953f2ca045aa7979396237e8af053f09e9e173 SHA512 63babf06fc3ad151c2026267cb766817a7902858ddab0cb625551c95a1c83d44b8cafa1bf22ce4e124aa5968b258c6946dadfdd5375f2c532b19173b84623008 +AUX 055-add-blockfuncs.patch 1301 BLAKE2B 412bbc63f0e961c27b4ac5576dc0d3605671becac60d742d238e1916b398ee7a146920d684a56e031088844065e9d37e4e8dbe5de370852b3edaeb7089c9e2ab SHA512 e4ea666b511fd51c8e91b284fae8bfab45180a1faff7fc8baeed3afe79e855bf27cb3434cfa4d6fd3eb6cfef685f8c13d02985580796bae75c4547713e2376e0 AUX 055-fix-base-do-not-quote-initargs-for-switch_root.patch 1095 BLAKE2B 35e2fbc027db3c6e642939d2139a2ef22b7273d4a11e957fb9e6376b14b8ba26daf39281bb8494251b9940a54cd78b42c357f88bc7469a64307a936b62fc1ca1 SHA512 f59624deb66644e8488e15079d8dbfa1e428bdd325ecd3f879fd1f07869ca7aae001109dabd1816875aeeb5962c05496ce0e2261ee3562fa1800a5e4b61d446a AUX 055-fix-crypt-remove-quotes-from-cryptsetupopts.patch 1404 BLAKE2B 4956f8df0b76c204279032fdf545f230f063fd7ea5393e3ade80587e10eb50dfba2e0677da04e641da17d1ce79564b3084274c739b3af59dab2226852b0835b2 SHA512 11243e311aeae6b9f1b6481521a92e4fd962e5fd24b1bd279e04f1f1618ba4ae0c4243d94274dda8e16d0311c377e0fbf2bae5c64c508e29caaf64d123c365a3 AUX 055-fix-usrmount-do-not-empty-_dev-variable.patch 1358 BLAKE2B 9a0b5e698884eb4e333ff3d519245bbe7bb909247ff999edac7bfce4b37a384f7b6ab7d0a4ffc14d638c46b137430d44d50de41193f46ba799b070bd2031e138 SHA512 1d9d01a6df6c0d9e77e2b0e4ca0881e33abbf3430817416660122960575d428f832a64c6925a2588d56bd042a32a2a68da7cf173f62b4cd23e12ea2e1b49d588 +AUX 055-tpm2-tss-typo.patch 836 BLAKE2B 8a6382a9b979e23e54e4160e6492bfc588520b859b6305d7dca196ef22703229b2a95819e85f82ed8b5ed98408a8f154b2e9bd13878c41f01b91d2395dd83a56 SHA512 593093a63df073bd1f22d8f4242496fab9e13b74ac470123101ddbf9a781c1ad5c8edade5a2d8691b6708ff7d4f5b773f4a6beb7c100bc7683240ccd3ea0b10f AUX crypt-ssh-luks.patch 4280 BLAKE2B 28d9e5ff0ae5c75a959b16aa40af6dacdd2645b6336ced98318095f483af6d6d86ffe3781f1870d4b493e7590193a80bf4c2142b51dce986822669c62d9739b6 SHA512 7a12fe767950c77ca76e895fecfd7f6d29df9da9646a5f8d6f6e7112391cd6e11e8f081783a0a535a7c8d49842a7edc42b173c924f43ace457a66c721f1d377d AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f AUX gentoo-ldconfig-paths.patch 1420 BLAKE2B 3ff093e1d244288585c369f0e3c1bc346abe1ee2ce8ee399098559765fa4e3a96611269de5f4edebe435e5a71fa1bb99eb650fcb221fad188e019837261645f4 SHA512 aa99bb08dbc8e38ee1794b7d77e5e6656afa7f6c67684d1b3fb6368861630ea7c7711d84cc48c2c5cf3b1fd98aa2673f816e4f5ebf651b63a07ded93b00d371a -DIST dracut-053.tar.xz 354668 BLAKE2B d20d0f1675e18cf44615a98255c8b1a73f23e9c665a771a1fe99716d3bf0b6082961ab20fe058bf31c106c4f521d9e8708e2ae98cff00f613197bbf9dd3abda3 SHA512 4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a -EBUILD dracut-053-r2.ebuild 4557 BLAKE2B 3a4104349cdece36650f6265e1926fa3f0944f9a8415aa7183bdf74005c6962dd9a88da7705e12b6a92414b179d7d09c18390c39e696336ba52774d1f5b7707e SHA512 ad4f5289cc84e58690215e9125a82e9138581831d8d3048bf58d6ca4cc038511a6efbb375dde0a2b986681ad0d63931933ecef97b36d4a4528938fea9f82a3d7 +DIST dracut-055.tar.xz 361752 BLAKE2B 9fcb0bce9ead2e079c70a377ea53701e4634d3dc64ae163e0e157d7d85822a274813e05f6079768640e1807818fad7a8158626413d773686a8d52fcd95fb5680 SHA512 2d2ea2889d9013bc94245bd7d1a2154f24d02bd9c2f7dbb28e5968e17d918e6598c68d85b0f551f968218980a80b19361ca0c9e8e94997ba54f4c09afcd6d866 +EBUILD dracut-055-r5.ebuild 5114 BLAKE2B 594872d4350d7460bc3d37371ebe15285e4c826ee365f96463c128197ee494a1330e77b31237ee6c8f38902be2fe91aa9dff4c23b87df643632b0d1ba85c321b SHA512 42781bf219147683395ade4038ba4ba9e3b2ce1c07c3c8d4a6cbff31f97cc96645dd873b647f716035ed84856beab1656f1687de72f26ef9087ddb35c5759c28 diff --git a/sys-kernel/dracut/dracut-053-r2.ebuild b/sys-kernel/dracut/dracut-055-r5.ebuild similarity index 83% rename from sys-kernel/dracut/dracut-053-r2.ebuild rename to sys-kernel/dracut/dracut-055-r5.ebuild index 7469c08..a94418f 100644 --- a/sys-kernel/dracut/dracut-053-r2.ebuild +++ b/sys-kernel/dracut/dracut-055-r5.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/dracutdevs/dracut" else [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" fi @@ -19,10 +19,9 @@ HOMEPAGE="https://dracut.wiki.kernel.org" LICENSE="GPL-2" SLOT="0" -IUSE="selinux" +IUSE="selinux test" -# Tests need root privileges, bug #298014 -RESTRICT="test" +RESTRICT="!test? ( test )" RDEPEND=" app-arch/cpio @@ -58,13 +57,15 @@ BDEPEND=" virtual/pkgconfig " -DOCS=( AUTHORS README.md README.generic README.kernel ) - QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( - "${FILESDIR}"/053-network-manager.patch - "${FILESDIR}"/gentoo-ldconfig-paths.patch + "${FILESDIR}"/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch + "${FILESDIR}"/055-fix-base-do-not-quote-initargs-for-switch_root.patch + "${FILESDIR}"/055-fix-usrmount-do-not-empty-_dev-variable.patch + "${FILESDIR}"/055-tpm2-tss-typo.patch + "${FILESDIR}"/055-add-blockfuncs.patch + "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch "${FILESDIR}"/crypt-ssh-luks.patch ) @@ -87,7 +88,28 @@ src_configure() { 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 diff --git a/sys-kernel/dracut/files/055-add-blockfuncs.patch b/sys-kernel/dracut/files/055-add-blockfuncs.patch new file mode 100644 index 0000000..56724e0 --- /dev/null +++ b/sys-kernel/dracut/files/055-add-blockfuncs.patch @@ -0,0 +1,25 @@ +From a91dcfeb54b8c6c810020f77124f6eaf6ef5baa9 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Thu, 12 Aug 2021 11:46:35 +0200 +Subject: [PATCH] fix(kernel-modules): add blk_mq_alloc_disk and + blk_cleanup_disk to blockfuncs + +Since kernel 5-14 those are used by many drivers for example: +xen-blkfront, loop, nbd, pd +--- + modules.d/90kernel-modules/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh +index 8b06893ae..69dc18b59 100755 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -2,7 +2,7 @@ + + # called by dracut + installkernel() { +- local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host|scsi_add_host_with_dma' ++ local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host|scsi_add_host_with_dma|blk_mq_alloc_disk|blk_cleanup_disk' + local -A _hostonly_drvs + + find_kernel_modules_external() { diff --git a/sys-kernel/dracut/files/055-tpm2-tss-typo.patch b/sys-kernel/dracut/files/055-tpm2-tss-typo.patch new file mode 100644 index 0000000..a04496a --- /dev/null +++ b/sys-kernel/dracut/files/055-tpm2-tss-typo.patch @@ -0,0 +1,23 @@ +From 8b17105bed69ed90582a13d97d95ee19e6581365 Mon Sep 17 00:00:00 2001 +From: Matthias Berndt +Date: Tue, 1 Jun 2021 19:32:48 +0200 +Subject: [PATCH] fix(tpm2-tss): typo in depends() + +There is no systemd-udev module, only systemd-udevd +--- + modules.d/91tpm2-tss/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/91tpm2-tss/module-setup.sh b/modules.d/91tpm2-tss/module-setup.sh +index 28af22a31..361131d66 100755 +--- a/modules.d/91tpm2-tss/module-setup.sh ++++ b/modules.d/91tpm2-tss/module-setup.sh +@@ -17,7 +17,7 @@ check() { + depends() { + + # This module has external dependency on other module(s). +- echo systemd-sysusers systemd-udev ++ echo systemd-sysusers systemd-udevd + # Return 0 to include the dependent module(s) in the initramfs. + return 0 +