commit: d18a2b2632fe13650dad639f8545bc3892caedd3 Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com> AuthorDate: Sat Mar 13 06:14:33 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 13 21:02:39 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d18a2b26
sys-kernel/dracut: remove from overlay Package-Manager: Portage-3.0.17, Repoman-3.0.2 RepoMan-Options: --force Manifest-Sign-Key: 0xA1919C830E9498E0 Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com> Closes: https://github.com/gentoo/musl/pull/401 Signed-off-by: Sam James <sam <AT> gentoo.org> net-dialup/ppp/Manifest | 27 +++- sys-kernel/dracut/Manifest | 5 - sys-kernel/dracut/dracut-045-r2.ebuild | 168 -------------------- sys-kernel/dracut/dracut-046-r1.ebuild | 169 --------------------- sys-kernel/dracut/dracut-047-r1.ebuild | 159 ------------------- sys-kernel/dracut/dracut-048-r1.ebuild | 154 ------------------- sys-kernel/dracut/dracut-049-r1.ebuild | 156 ------------------- sys-kernel/dracut/files/045-systemdutildir.patch | 45 ------ sys-kernel/dracut/files/046-amd-microcode.patch | 30 ---- .../047-all-fix-issues-found-by-shellcheck.patch | 77 ---------- ...mouth-fix-detection-of-plymouth-directory.patch | 31 ---- ...dracut-install-simplify-ldd-parsing-logic.patch | 41 ----- ...etwork-Don-t-include-40network-by-default.patch | 34 ----- ...49-remove-bashism-in-various-boot-scripts.patch | 89 ----------- sys-kernel/dracut/files/dracut-045-libfts.patch | 87 ----------- sys-kernel/dracut/files/dracut-046-libfts.patch | 87 ----------- sys-kernel/dracut/files/dracut-047-libfts.patch | 87 ----------- sys-kernel/dracut/files/dracut-sys-reg_h.patch | 11 -- sys-kernel/dracut/metadata.xml | 24 --- 19 files changed, 24 insertions(+), 1457 deletions(-) diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 3f684ec..ae5c032 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,3 +1,24 @@ -DIST ppp-2.4.7-patches-4.tar.xz 37308 SHA256 afd96003fb50b462852d81f10af344ff23dcf26f626e65301b45dbaaa89f03c4 SHA512 f217f7272a791605101e0f1885350db8ff8b580a647e670461b81fe0026ee9050ce68b9b9635edee89ec1ada7adf000c7e6b3aa5a5dafec875ce715a9dfb84d2 WHIRLPOOL ec8ef47938eac296e1573c8281afbfc0914e4cd2461a082f670a2367f4a77359f09b4986c10c498bf39b6a1441bbf9700529991a82a01854d8e2289a14636e9d -DIST ppp-2.4.7.tar.gz 688117 SHA256 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 WHIRLPOOL 48f3251e6b955ecfdaf9260b9ea5220d9e355fff836e2f5217ee0b15bf2c93e43f8207005f58bf1f97fb8ff0c76c56df8ecd8536f63c4d84d5940458ba0ba5c3 -DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 WHIRLPOOL 74e5e0d7f9bc52d1b9cfeff83fe74c2b38cc10c60636cd9c0f5d67d61dc7da56dbf2bcc84afa29444546792876cb36afbc853a6515ce9b3d83d6de98eacedd1e +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +DIST ppp-2.4.7-patches-4.tar.xz 37308 BLAKE2B a53ab7c230fac7fea38910c5d9bb89b8ecb8728e899ed938292040e788b43ab8566797256329c9326ab1e6d7a02bf231df035a6e7b427f187eab554d600a7822 SHA512 f217f7272a791605101e0f1885350db8ff8b580a647e670461b81fe0026ee9050ce68b9b9635edee89ec1ada7adf000c7e6b3aa5a5dafec875ce715a9dfb84d2 +DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 +DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 +-----BEGIN PGP SIGNATURE----- + +iQKTBAEBCAB9FiEEZdLCSnfk9z83VSkfsaMsEcx8U7oFAmBMWBpfFIAAAAAALgAo +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY1 +RDJDMjRBNzdFNEY3M0YzNzU1MjkxRkIxQTMyQzExQ0M3QzUzQkEACgkQsaMsEcx8 +U7oN6g//Wa0k9+VNyXZmd18F24BKJNVzQjjwSGBpVbb190PJz30vGtgPFg6C0s5z +O/MykXqkhpbUnBmC1xiwbufz/wLdBsxmiSnPe5b8ICZZRpPQaRNGt1ikvHcI8+P7 +JY1pHGQiLrNVjSI5CGjy4aCVQ9ESxzX2eOw6A/LJ8On7Ajgr2LHsFieSAvO6qZLQ +UePT1Qeocewd4jeMcsMhyqovnjEBF6fzM5URyCT87JLffuwTQfRS51+kHWU+Hx7o +HkvhLiYLFhyqdYoVLwTeikaZnbjjVHd0k01Q3bSoaj2/JOwjnfEdN4n/gvcKumkz +zMrJc0NWSThON1gIeN0JAOB9ivekw6LCXIxCqH6+kDb/yzJ5TkUYaRSyxYKXn7dl +6OHTDzr1kf+3wzFSCCnjRRBQwPdPkfF6T+jkZRv6gM3yUVtLeDbepaX5wSG0MDKP +R5RO9RtQVYGia9XEurVwNBsBfjGTsVS/aB48CIz2QjeeDX6ixr0OxW6/qAShA9ZD +Lm5jeRSSWSx7kRDhCuYDvk2bElrMiH7IZwzkQpVV4wz6TfBoQEbXK9168QnJhw2r +xEN2GMjRcbA/qBNwIuNfQ4mMk6VtcHFOuMzpdIE3QUbe+CIw9HY+gFjONY+Wxhv/ +nbEiXSBGjWdRI6wUPam2uXpgO8LTkIp4wHVQo8GaH//OZgNqLJs= +=kOqi +-----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest deleted file mode 100644 index 7732468..0000000 --- a/sys-kernel/dracut/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST dracut-045.tar.xz 292652 BLAKE2B 0e7c57ddca6757d59823afdc4ff23dcb06cc9cec317ece8cca14c5b6dfd2a7984fb8e857f5f48ad61922ba11b4b68944b366bddb02552efb52375f6e12802de7 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a -DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122 -DIST dracut-047.tar.xz 305836 BLAKE2B 18333ae1e24cfbbb6a152bf9ba2c48884821f6a506344259ba56c581a9f3efac7b4c88e8ca149ef1f83347a5e4d59acba61e42b8e0ab3a9e9beb8684d5db28b0 SHA512 03369726b6c2b682d0c9dead7b7dbd1c3989aaf2b4a561015634d33a94e5230d03cb634c3890191b19dd8c1c83389533ae1a46d45d2024ba885e0d2d46c5d035 -DIST dracut-048.tar.xz 308484 BLAKE2B b19c8122034a8b40cbc9d09245730900b59691c336f1d231e768786ad64068e0a8daf57ae9a4182ab50d9e1c683c9b7dcac354eb26d8a60f061db78121bc11c7 SHA512 97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0 -DIST dracut-049.tar.gz 376857 BLAKE2B e50084164e26aae6de812345cc76782435ec84951b44eea454355d0c65fe84fdd0858733de534bdf018bdfd92922f0be30b74d74be329a918e55d96c5e4d4fb6 SHA512 51489570856538588868a66c7bcc8a3728574592529905484526c523398dc1b8f1416e6b264780303acd08d818417a9668b76f1d64d3194432b5af79dc15c9f7 diff --git a/sys-kernel/dracut/dracut-045-r2.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild deleted file mode 100644 index 4bfd9c6..0000000 --- a/sys-kernel/dracut/dracut-045-r2.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 linux-info toolchain-funcs systemd - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" -SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86" -IUSE="debug selinux" - -RESTRICT="test" - -CDEPEND="virtual/udev - virtual/pkgconfig - >=sys-apps/kmod-15[tools] - " -RDEPEND="${CDEPEND} - app-arch/cpio - >=app-shells/bash-4.0:0 - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/systemd[sysv-utils] - ) - sys-apps/coreutils[xattr(-)] - >=sys-apps/util-linux-2.21 - - debug? ( dev-util/strace ) - elibc_musl? ( sys-libs/fts-standalone ) - selinux? ( - sys-libs/libselinux - sys-libs/libsepol - sec-policy/selinux-dracut - ) - !net-analyzer/arping - " -DEPEND="${CDEPEND} - app-text/asciidoc - >=dev-libs/libxslt-1.1.26 - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}/045-systemdutildir.patch" - "${FILESDIR}"/${P}-libfts.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 -} - -src_install() { - default - - local dracutlibdir="usr/lib/dracut" - - local libdirs="/$(get_libdir) /usr/$(get_libdir)" - if [[ ${SYMLINK_LIB} = yes ]]; then - # Preserve lib -> lib64 symlinks in initramfs - [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" - fi - - einfo "Setting libdirs to \"${libdirs}\" ..." - echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf" - insinto "${dracutlibdir}/dracut.conf.d" - doins "${T}/gentoo.conf" - - insinto /etc/logrotate.d - newins dracut.logrotate dracut - - dodir /var/lib/dracut/overlay - - dodoc dracut.html -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_exists; then - ewarn "" - ewarn "If the following test report contains a missing kernel" - ewarn "configuration option, you should reconfigure and rebuild your" - ewarn "kernel before booting image generated with this Dracut version." - ewarn "" - - local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" - - # Kernel configuration options descriptions: - local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" - local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ -"(initramfs/initrd) support" - - local opt desc - - # Generate ERROR_* variables for check_extra_config. - for opt in ${CONFIG_CHECK}; do - opt=${opt#\~} - desc=desc_${opt} - eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ - "is missing and REQUIRED'" - done - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked. Do you have" - ewarn "/usr/src/linux/.config file there? Please check manually if" - ewarn "following options are enabled:" - ewarn "" - ewarn " CONFIG_BLK_DEV_INITRD" - ewarn " CONFIG_DEVTMPFS" - ewarn "" - fi - - elog "To get additional features, a number of optional runtime" - elog "dependencies may be installed:" - elog "" - optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 "net-misc/iputils[arping]" - optfeature \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct - 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 "Framebuffer splash (media-gfx/splashutils)" \ - media-gfx/splashutils - optfeature "Support iSCSI" sys-block/open-iscsi - optfeature "Support Logical Volume Manager" sys-fs/lvm2 - optfeature "Support MD devices, also known as software RAID devices" \ - sys-fs/mdadm - 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" \ - net-misc/openssh - optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ - app-admin/rsyslog -} diff --git a/sys-kernel/dracut/dracut-046-r1.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild deleted file mode 100644 index a0cace4..0000000 --- a/sys-kernel/dracut/dracut-046-r1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 linux-info toolchain-funcs systemd - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" -SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86" -IUSE="debug selinux" - -RESTRICT="test" - -CDEPEND="virtual/udev - virtual/pkgconfig - >=sys-apps/kmod-15[tools] - " -RDEPEND="${CDEPEND} - app-arch/cpio - >=app-shells/bash-4.0:0 - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/systemd[sysv-utils] - ) - sys-apps/coreutils[xattr(-)] - >=sys-apps/util-linux-2.21 - - debug? ( dev-util/strace ) - elibc_musl? ( sys-libs/fts-standalone ) - selinux? ( - sys-libs/libselinux - sys-libs/libsepol - sec-policy/selinux-dracut - ) - !net-analyzer/arping - " -DEPEND="${CDEPEND} - app-text/asciidoc - >=dev-libs/libxslt-1.1.26 - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}/045-systemdutildir.patch" - "${FILESDIR}/046-amd-microcode.patch" - "${FILESDIR}"/${P}-libfts.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 -} - -src_install() { - default - - local dracutlibdir="usr/lib/dracut" - - local libdirs="/$(get_libdir) /usr/$(get_libdir)" - if [[ ${SYMLINK_LIB} = yes ]]; then - # Preserve lib -> lib64 symlinks in initramfs - [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" - fi - - einfo "Setting libdirs to \"${libdirs}\" ..." - echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf" - insinto "${dracutlibdir}/dracut.conf.d" - doins "${T}/gentoo.conf" - - insinto /etc/logrotate.d - newins dracut.logrotate dracut - - dodir /var/lib/dracut/overlay - - dodoc dracut.html -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_exists; then - ewarn "" - ewarn "If the following test report contains a missing kernel" - ewarn "configuration option, you should reconfigure and rebuild your" - ewarn "kernel before booting image generated with this Dracut version." - ewarn "" - - local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" - - # Kernel configuration options descriptions: - local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" - local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ -"(initramfs/initrd) support" - - local opt desc - - # Generate ERROR_* variables for check_extra_config. - for opt in ${CONFIG_CHECK}; do - opt=${opt#\~} - desc=desc_${opt} - eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ - "is missing and REQUIRED'" - done - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked. Do you have" - ewarn "/usr/src/linux/.config file there? Please check manually if" - ewarn "following options are enabled:" - ewarn "" - ewarn " CONFIG_BLK_DEV_INITRD" - ewarn " CONFIG_DEVTMPFS" - ewarn "" - fi - - elog "To get additional features, a number of optional runtime" - elog "dependencies may be installed:" - elog "" - optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 "net-misc/iputils[arping]" - optfeature \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct - 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 "Framebuffer splash (media-gfx/splashutils)" \ - media-gfx/splashutils - optfeature "Support iSCSI" sys-block/open-iscsi - optfeature "Support Logical Volume Manager" sys-fs/lvm2 - optfeature "Support MD devices, also known as software RAID devices" \ - sys-fs/mdadm - 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" \ - net-misc/openssh - optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ - app-admin/rsyslog -} diff --git a/sys-kernel/dracut/dracut-047-r1.ebuild b/sys-kernel/dracut/dracut-047-r1.ebuild deleted file mode 100644 index c49417e..0000000 --- a/sys-kernel/dracut/dracut-047-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 linux-info systemd toolchain-funcs - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" -SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~mips ppc x86" -IUSE="debug selinux" - -# Tests need root privileges, bug #298014 -RESTRICT="test" - -COMMON_DEPEND=">=sys-apps/kmod-23[tools] - virtual/pkgconfig - virtual/udev - " -RDEPEND="${COMMON_DEPEND} - app-arch/cpio - >=app-shells/bash-4.0:0 - sys-apps/coreutils[xattr(-)] - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/systemd[sysv-utils] - ) - >=sys-apps/util-linux-2.21 - - debug? ( dev-util/strace ) - elibc_musl? ( sys-libs/fts-standalone ) - selinux? ( - sec-policy/selinux-dracut - sys-libs/libselinux - sys-libs/libsepol - ) - " -DEPEND="${COMMON_DEPEND} - app-text/asciidoc - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - >=dev-libs/libxslt-1.1.26 - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}/045-systemdutildir.patch" - "${FILESDIR}/047-all-fix-issues-found-by-shellcheck.patch" - "${FILESDIR}/047-plymouth-fix-detection-of-plymouth-directory.patch" - "${FILESDIR}"/${P}-libfts.patch - "${FILESDIR}"/${PN}-sys-reg_h.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 -} - -src_install() { - default - - local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) - if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then - # Preserve lib -> lib64 symlinks in initramfs - libdirs+=( /lib /usr/lib ) - fi - - einfo "Setting libdirs to \"${libdirs[*]}\" ..." - echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die - insinto "/usr/lib/dracut/dracut.conf.d" - doins "${T}/gentoo.conf" - - insinto /etc/logrotate.d - newins dracut.logrotate dracut - - docinto html - dodoc dracut.html -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_exists; then - ewarn "" - ewarn "If the following test report contains a missing kernel" - ewarn "configuration option, you should reconfigure and rebuild your" - ewarn "kernel before booting image generated with this Dracut version." - ewarn "" - - local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" - - # Kernel configuration options descriptions: - local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' - ERROR_DEVTMPFS+='is missing and REQUIRED' - local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' - ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked." - ewarn "Please check manually if following options are enabled:" - ewarn "" - ewarn " CONFIG_BLK_DEV_INITRD" - ewarn " CONFIG_DEVTMPFS" - ewarn "" - fi - - elog "To get additional features, a number of optional runtime" - elog "dependencies may be installed:" - elog "" - optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 "net-misc/iputils[arping]" - optfeature \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct - 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 "Framebuffer splash (media-gfx/splashutils)" \ - media-gfx/splashutils - optfeature "Support iSCSI" sys-block/open-iscsi - optfeature "Support Logical Volume Manager" sys-fs/lvm2 - optfeature "Support MD devices, also known as software RAID devices" \ - sys-fs/mdadm - 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" \ - net-misc/openssh - optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ - app-admin/rsyslog -} diff --git a/sys-kernel/dracut/dracut-048-r1.ebuild b/sys-kernel/dracut/dracut-048-r1.ebuild deleted file mode 100644 index 6fc285b..0000000 --- a/sys-kernel/dracut/dracut-048-r1.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" -SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" -IUSE="debug selinux" - -# Tests need root privileges, bug #298014 -RESTRICT="test" - -COMMON_DEPEND=">=sys-apps/kmod-23[tools] - virtual/pkgconfig - virtual/udev - " -RDEPEND="${COMMON_DEPEND} - app-arch/cpio - >=app-shells/bash-4.0:0 - sys-apps/coreutils[xattr(-)] - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/systemd[sysv-utils] - ) - >=sys-apps/util-linux-2.21 - - debug? ( dev-util/strace ) - elibc_musl? ( sys-libs/fts-standalone ) - selinux? ( - sec-policy/selinux-dracut - sys-libs/libselinux - sys-libs/libsepol - ) - " -DEPEND="${COMMON_DEPEND} - app-text/asciidoc - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - >=dev-libs/libxslt-1.1.26 - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch - "${FILESDIR}"/${PN}-047-libfts.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 -} - -src_install() { - default - - local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) - if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then - # Preserve lib -> lib64 symlinks in initramfs - libdirs+=( /lib /usr/lib ) - fi - - einfo "Setting libdirs to \"${libdirs[*]}\" ..." - echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die - insinto "/usr/lib/dracut/dracut.conf.d" - doins "${T}/gentoo.conf" - - insinto /etc/logrotate.d - newins dracut.logrotate dracut - - docinto html - dodoc dracut.html -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_exists; then - ewarn "" - ewarn "If the following test report contains a missing kernel" - ewarn "configuration option, you should reconfigure and rebuild your" - ewarn "kernel before booting image generated with this Dracut version." - ewarn "" - - local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" - - # Kernel configuration options descriptions: - local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' - ERROR_DEVTMPFS+='is missing and REQUIRED' - local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' - ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked." - ewarn "Please check manually if following options are enabled:" - ewarn "" - ewarn " CONFIG_BLK_DEV_INITRD" - ewarn " CONFIG_DEVTMPFS" - ewarn "" - fi - - elog "To get additional features, a number of optional runtime" - elog "dependencies may be installed:" - elog "" - optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 "net-misc/iputils[arping]" - optfeature \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct - 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 "Support iSCSI" sys-block/open-iscsi - optfeature "Support Logical Volume Manager" sys-fs/lvm2 - optfeature "Support MD devices, also known as software RAID devices" \ - sys-fs/mdadm - 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" \ - net-misc/openssh - optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ - app-admin/rsyslog -} diff --git a/sys-kernel/dracut/dracut-049-r1.ebuild b/sys-kernel/dracut/dracut-049-r1.ebuild deleted file mode 100644 index 15f642d..0000000 --- a/sys-kernel/dracut/dracut-049-r1.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dracutdevs/dracut" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" - SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="selinux" - -# Tests need root privileges, bug #298014 -RESTRICT="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/systemd[sysv-utils] - ) - >=sys-apps/util-linux-2.21 - virtual/pkgconfig - virtual/udev - - selinux? ( - sec-policy/selinux-dracut - sys-libs/libselinux - sys-libs/libsepol - ) - " -DEPEND=">=sys-apps/kmod-23" - -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 - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch - "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch - "${FILESDIR}"/${PN}-047-libfts.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 ]] ; then - # Source tarball from github doesn't include this file - echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die - fi -} - -src_install() { - default - - insinto /etc/logrotate.d - newins dracut.logrotate dracut - - docinto html - dodoc dracut.html -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_exists; then - ewarn "" - ewarn "If the following test report contains a missing kernel" - ewarn "configuration option, you should reconfigure and rebuild your" - ewarn "kernel before booting image generated with this Dracut version." - ewarn "" - - local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" - - # Kernel configuration options descriptions: - local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' - ERROR_DEVTMPFS+='is missing and REQUIRED' - local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' - ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked." - ewarn "Please check manually if following options are enabled:" - ewarn "" - ewarn " CONFIG_BLK_DEV_INITRD" - ewarn " CONFIG_DEVTMPFS" - ewarn "" - fi - - elog "To get additional features, a number of optional runtime" - elog "dependencies may be installed:" - elog "" - 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 \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct - 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 "Support iSCSI" sys-block/open-iscsi - optfeature "Support Logical Volume Manager" sys-fs/lvm2 - optfeature "Support MD devices, also known as software RAID devices" \ - sys-fs/mdadm - 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" \ - net-misc/openssh - optfeature "Enable logging with rsyslog" app-admin/rsyslog -} diff --git a/sys-kernel/dracut/files/045-systemdutildir.patch b/sys-kernel/dracut/files/045-systemdutildir.patch deleted file mode 100644 index e56abba..0000000 --- a/sys-kernel/dracut/files/045-systemdutildir.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ed5cc98864c28eab2c4cb45ec0f67450699aaaa8 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Mon, 3 Jul 2017 22:39:42 -0400 -Subject: [PATCH] dracut.sh: improve udevdir and systemdutildir fallback logic - -Check for a common binary in systemdutildir. This resolves an issue on -split-usr systems, where it is common to have both /lib/systemd[/system] -and /usr/lib/systemd[/user] present. - -Check for systemd-udevd specifically, since some distros (Gentoo) allow -udev to be installed without the rest of the systemd stack. - -Similar logic is applied to udevdir simply for consistency. ---- - dracut.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index 64d94201..67c12a72 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1266,16 +1266,16 @@ done - [[ -d $udevdir ]] \ - || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)" - if ! [[ -d "$udevdir" ]]; then -- [[ ! -h /lib ]] && [[ -d /lib/udev ]] && udevdir=/lib/udev -- [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev -+ [[ -e /lib/udev/collect ]] && udevdir=/lib/udev -+ [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev - fi - - [[ -d $systemdutildir ]] \ - || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null) - - if ! [[ -d "$systemdutildir" ]]; then -- [[ ! -h /lib ]] && [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd -- [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd -+ [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd -+ [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd - fi - - [[ -d $systemdsystemunitdir ]] \ --- -2.13.2 - diff --git a/sys-kernel/dracut/files/046-amd-microcode.patch b/sys-kernel/dracut/files/046-amd-microcode.patch deleted file mode 100644 index c351275..0000000 --- a/sys-kernel/dracut/files/046-amd-microcode.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a1250a704e33c59f2395aaad054db1c745a5c98a Mon Sep 17 00:00:00 2001 -From: Daniel Molkentin <dmolken...@suse.com> -Date: Tue, 12 Dec 2017 17:48:36 +0100 -Subject: [PATCH] Simplify microcode lookup for for AMD CPUs - ---- - dracut-functions.sh | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 112b2434..d7fc5303 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -661,11 +661,8 @@ get_ucode_file () - local stepping=`grep -E "stepping" /proc/cpuinfo | head -1 | sed s/.*:\ //` - - if [[ "$(get_cpu_vendor)" == "AMD" ]]; then -- # If family greater than or equal to 0x16 -- if [[ $family -ge 22 ]]; then -- printf "microcode_amd_fam16h.bin" -- elif [[ $family -eq 21 ]]; then -- printf "microcode_amd_fam15h.bin" -+ if [[ $family -ge 21 ]]; then -+ printf "microcode_amd_fam%xh.bin" $family - else - printf "microcode_amd.bin" - fi --- -2.16.0.rc0 - diff --git a/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch b/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch deleted file mode 100644 index d5cbe04..0000000 --- a/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 3aa37cafde734719f2377600a17459fad30edfbc Mon Sep 17 00:00:00 2001 -From: Lukas Nykryn <lnyk...@redhat.com> -Date: Fri, 2 Mar 2018 12:29:46 +0100 -Subject: [PATCH 06/14] all: fix issues found by shellcheck -To: <initra...@vger.kernel.org> - -Error: SHELLCHECK_WARNING: -/usr/lib/dracut/dracut-init.sh:939:20: error: Argument to implicit -n is always true due to literal strings. [SC2157] - 937| dracut_kernel_post() { - 938| for _f in modules.builtin.bin modules.builtin modules.order; do - 939|-> [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" - 940| done - 941| - -Error: SHELLCHECK_WARNING: -/usr/lib/dracut/modules.d/98syslog/parse-syslog-opts.sh:18:12: error: This expression is constant. Did you forget a $ somewhere? [SC2078] - 16| elif [ -e /sbin/syslogd ]; then - 17| syslogtype="syslogd" - 18|-> elif [ /sbin/syslog-ng ]; then - 19| syslogtype="syslog-ng" - 20| else - -Error: SHELLCHECK_WARNING: -/usr/lib/dracut/modules.d/90crypt/crypt-lib.sh:15:29: error: Since you double quoted this, it will not word split, and the loop will only run once. [SC2066] - 13| strstr "$d" "${luks##luks-}" && return 0 - 14| if [ -n "$dev" ]; then - 15|-> for _dev in "$(devnames $d)"; do - 16| [ "$dev" -ef "$_dev" ] && return 0 - 17| done ---- - dracut-init.sh | 2 +- - modules.d/90crypt/crypt-lib.sh | 2 +- - modules.d/98syslog/parse-syslog-opts.sh | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dracut-init.sh b/dracut-init.sh -index 53e6f13a..1278c638 100644 ---- a/dracut-init.sh -+++ b/dracut-init.sh -@@ -942,7 +942,7 @@ for_each_kmod_dep() { - - dracut_kernel_post() { - for _f in modules.builtin.bin modules.builtin modules.order; do -- [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" -+ [[ -e $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" - done - - # generate module dependencies for the initrd -diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh -index 532b9a71..bbf485e0 100755 ---- a/modules.d/90crypt/crypt-lib.sh -+++ b/modules.d/90crypt/crypt-lib.sh -@@ -12,7 +12,7 @@ crypttab_contains() { - strstr "${l##luks-}" "${luks##luks-}" && return 0 - strstr "$d" "${luks##luks-}" && return 0 - if [ -n "$dev" ]; then -- for _dev in "$(devnames $d)"; do -+ for _dev in $(devnames $d); do - [ "$dev" -ef "$_dev" ] && return 0 - done - fi -diff --git a/modules.d/98syslog/parse-syslog-opts.sh b/modules.d/98syslog/parse-syslog-opts.sh -index 50ec2759..9ec6ad47 100755 ---- a/modules.d/98syslog/parse-syslog-opts.sh -+++ b/modules.d/98syslog/parse-syslog-opts.sh -@@ -15,7 +15,7 @@ detect_syslog() { - syslogtype="rsyslogd" - elif [ -e /sbin/syslogd ]; then - syslogtype="syslogd" -- elif [ /sbin/syslog-ng ]; then -+ elif [ -e /sbin/syslog-ng ]; then - syslogtype="syslog-ng" - else - warn "Could not find any syslog binary although the syslogmodule is selected to be installed. Please check." --- -2.16.1 - diff --git a/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch b/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch deleted file mode 100644 index 42f8772..0000000 --- a/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fe6c7e0f06cde65effb3503a47c31ac39aceefb6 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexan...@tsoy.me> -Date: Fri, 23 Mar 2018 11:52:27 +0300 -Subject: [PATCH 14/14] plymouth: fix detection of plymouth directory -To: <initra...@vger.kernel.org> - -Some distros have both /usr/lib/plymouth and /usr/libexec/plymouth -directorirs, so we should check the existance of plymouth-populate-initrd -script. - -Fixes: 421b46f8ae89cfe2b62e880a8a5079ee8c1b3aae ---- - modules.d/50plymouth/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh -index 5fbca8b0..b51913e8 100755 ---- a/modules.d/50plymouth/module-setup.sh -+++ b/modules.d/50plymouth/module-setup.sh -@@ -6,7 +6,7 @@ pkglib_dir() { - _dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth" - fi - for _dir in $_dirs; do -- if [ -d $_dir ]; then -+ if [ -x $_dir/plymouth-populate-initrd ]; then - echo $_dir - return - fi --- -2.16.1 - diff --git a/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch b/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch deleted file mode 100644 index aa9c543..0000000 --- a/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6d886bb74d1608e4565d926aa259ea5afc9df7b9 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Thu, 4 Oct 2018 16:45:47 -0400 -Subject: [PATCH] dracut-install: simplify ldd parsing logic - -The previous logic would not handle absolute paths on the left side of -the "=>" properly. For example, on Gentoo ARM64, ldd outputs this: - - /lib/ld-linux-aarch64.so.1 => /lib64/ld-linux-aarch64.so.1 - -At runtime, the kernel tries to load the file from /lib, and fails if we -only provide it in /lib64. - -Instead of looking for the first slash after the "=>", just look for the -first slash, period. This would fail if we somehow had a relative path -on the left side (foo/libbar.so), but I'm not aware of any binaries that -would contain such an entry in DT_NEEDED. - -Bug: https://bugs.gentoo.org/667752 -Signed-off-by: Mike Gilbert <flop...@gentoo.org> ---- - install/dracut-install.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/install/dracut-install.c b/install/dracut-install.c -index 88bca1d44..5f352b360 100644 ---- a/install/dracut-install.c -+++ b/install/dracut-install.c -@@ -479,11 +479,7 @@ static int resolve_deps(const char *src) - if (strstr(buf, destrootdir)) - break; - -- p = strstr(buf, "=>"); -- if (!p) -- p = buf; -- -- p = strchr(p, '/'); -+ p = strchr(buf, '/'); - if (p) { - char *q; - diff --git a/sys-kernel/dracut/files/049-40network-Don-t-include-40network-by-default.patch b/sys-kernel/dracut/files/049-40network-Don-t-include-40network-by-default.patch deleted file mode 100644 index 0d53794..0000000 --- a/sys-kernel/dracut/files/049-40network-Don-t-include-40network-by-default.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 83cbc06ab91288e2d931b4f36935bfdb79a99b0e Mon Sep 17 00:00:00 2001 -From: Kairui Song <kas...@redhat.com> -Date: Fri, 12 Oct 2018 13:07:13 +0800 -Subject: [PATCH] 40network: Don't include 40network by default -To: <initra...@vger.kernel.org> - -commit 7347391 ('network-legacy: split off from network module') -splitted network function to network-legacy and removed check() function -of 40network. This caused 40network to be included even if network is -not needed. - -Signed-off-by: Kairui Song <kas...@redhat.com> ---- - modules.d/40network/module-setup.sh | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 57c0a45e..e8541636 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -1,5 +1,10 @@ - #!/bin/bash - -+# called by dracut -+check() { -+ return 255 -+} -+ - # called by dracut - depends() { - echo -n "kernel-network-modules " --- -2.19.2 - diff --git a/sys-kernel/dracut/files/049-remove-bashism-in-various-boot-scripts.patch b/sys-kernel/dracut/files/049-remove-bashism-in-various-boot-scripts.patch deleted file mode 100644 index 93e3ed5..0000000 --- a/sys-kernel/dracut/files/049-remove-bashism-in-various-boot-scripts.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 09d2a1605b1b2663e3c25f1d9950b23a2bf4ad89 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - <congdan...@gmail.com> -Date: Sun, 6 Jan 2019 11:48:02 +0700 -Subject: [PATCH] remove bashism in various boot scripts -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -To: <initra...@vger.kernel.org> - -When using dash as initramfs shell, the boot process is broken. - -Signed-off-by: Đoàn Trần Công Danh <congdan...@gmail.com> ---- - modules.d/90crypt/crypt-lib.sh | 2 +- - modules.d/90crypt/parse-keydev.sh | 2 +- - modules.d/91crypt-gpg/crypt-gpg-lib.sh | 2 +- - modules.d/95dcssblk/parse-dcssblk.sh | 2 +- - modules.d/98syslog/rsyslogd-start.sh | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh -index bbf485e0..688ea251 100755 ---- a/modules.d/90crypt/crypt-lib.sh -+++ b/modules.d/90crypt/crypt-lib.sh -@@ -191,7 +191,7 @@ readkey() { - local device="$3" - - # No mounting needed if the keyfile resides inside the initrd -- if [ "/" == "$keydev" ]; then -+ if [ "/" = "$keydev" ]; then - local mntp=/ - else - # This creates a unique single mountpoint for *, or several for explicitly -diff --git a/modules.d/90crypt/parse-keydev.sh b/modules.d/90crypt/parse-keydev.sh -index a45b2fb5..04813414 100755 ---- a/modules.d/90crypt/parse-keydev.sh -+++ b/modules.d/90crypt/parse-keydev.sh -@@ -18,7 +18,7 @@ if getargbool 1 rd.luks -n rd_NO_LUKS && \ - fi - - # A keydev of '/' is treated as the initrd itself -- if [ "/" == "$keydev" ]; then -+ if [ "/" = "$keydev" ]; then - [ -z "$luksdev" ] && luksdev='*' - echo "$luksdev:$keydev:$keypath" >> /tmp/luks.keys - continue -diff --git a/modules.d/91crypt-gpg/crypt-gpg-lib.sh b/modules.d/91crypt-gpg/crypt-gpg-lib.sh -index b85ed2b8..c051b430 100755 ---- a/modules.d/91crypt-gpg/crypt-gpg-lib.sh -+++ b/modules.d/91crypt-gpg/crypt-gpg-lib.sh -@@ -53,7 +53,7 @@ gpg_decrypt() { - --tries 3 --tty-echo-off - - # Clean up the smartcard gpg-agent -- if [ "${useSmartcard}" == "1" ]; then -+ if [ "${useSmartcard}" = "1" ]; then - GNUPGHOME="$gpghome" gpg-connect-agent 1>/dev/null killagent /bye - fi - -diff --git a/modules.d/95dcssblk/parse-dcssblk.sh b/modules.d/95dcssblk/parse-dcssblk.sh -index 8f174408..27ac1d8d 100644 ---- a/modules.d/95dcssblk/parse-dcssblk.sh -+++ b/modules.d/95dcssblk/parse-dcssblk.sh -@@ -2,7 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - dcssblk_arg=$(getarg rd.dcssblk=) --if [ $? == 0 ];then -+if [ $? = 0 ];then - info "Loading dcssblk segments=$dcssblk_arg" - modprobe dcssblk segments=$dcssblk_arg - fi -diff --git a/modules.d/98syslog/rsyslogd-start.sh b/modules.d/98syslog/rsyslogd-start.sh -index c64f2121..86ad50ea 100755 ---- a/modules.d/98syslog/rsyslogd-start.sh -+++ b/modules.d/98syslog/rsyslogd-start.sh -@@ -38,7 +38,7 @@ rsyslog_config() { - [ -f /tmp/syslog.conf ] && read conf < /tmp/syslog.conf - [ -z "$conf" ] && conf="/etc/rsyslog.conf" && echo "$conf" > /tmp/syslog.conf - --if [ $type == "rsyslogd" ]; then -+if [ $type = "rsyslogd" ]; then - template=/etc/templates/rsyslog.conf - if [ -n "$server" ]; then - rsyslog_config "$server" "$template" "$filters" > $conf --- -2.19.2 - diff --git a/sys-kernel/dracut/files/dracut-045-libfts.patch b/sys-kernel/dracut/files/dracut-045-libfts.patch deleted file mode 100644 index cb35fe5..0000000 --- a/sys-kernel/dracut/files/dracut-045-libfts.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -Naur dracut-045.orig/Makefile dracut-045/Makefile ---- dracut-045.orig/Makefile 2017-07-03 12:44:30.407689932 -0700 -+++ dracut-045/Makefile 2017-07-03 13:17:10.262396884 -0700 -@@ -12,7 +12,7 @@ - sysconfdir ?= ${prefix}/etc - bindir ?= ${prefix}/bin - mandir ?= ${prefix}/share/man --CFLAGS ?= -O2 -g -Wall $(KMOD_CFLAGS) -+CFLAGS ?= -O2 -g -Wall $(KMOD_CFLAGS) $(FTS_CFLAGS) - CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 - bashcompletiondir ?= ${datadir}/bash-completion/completions - pkgconfigdatadir ?= $(datadir)/pkgconfig -@@ -61,7 +61,7 @@ - install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h install/log.h - - install/dracut-install: $(DRACUT_INSTALL_OBJECTS) -- $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS) -+ $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS) $(FTS_LIBS) - - dracut-install: install/dracut-install - ln -fs $< $@ -diff -Naur dracut-045.orig/configure dracut-045/configure ---- dracut-045.orig/configure 2017-07-03 12:44:30.409689958 -0700 -+++ dracut-045/configure 2017-07-03 13:29:29.159797981 -0700 -@@ -7,6 +7,7 @@ - - enable_documentation=yes - -+CC="${CC:-gcc}" - PKG_CONFIG="${PKG_CONFIG:-pkg-config}" - - # Little helper function for reading args from the commandline. -@@ -52,10 +53,40 @@ - shift - done - -+printf "checking for libkmod... " - if ! ${PKG_CONFIG} --exists --print-errors " libkmod >= 15 "; then -+ printf "no\n" - echo "dracut needs pkg-config and libkmod >= 15." >&2 - exit 1 - fi -+printf "yes\n" -+ -+tmpc="./conftest.c" -+ -+printf "checking whether we have fts available from libc... " -+echo '#if !defined(__x86_64__)' > "$tmpc" -+echo '#undef _FILE_OFFSET_BITS' >> "$tmpc" -+echo '#define _FILE_OFFSET_BITS 32' >> "$tmpc" -+echo '#endif' >> "$tmpc" -+echo '#include <fts.h>' >> "$tmpc" -+echo 'int main() { FTS* fts = 0; return fts_close(fts); return 0; }' >> "$tmpc" -+if $CC -o /dev/null "$tmpc" >/dev/null 2>&1 ; then -+printf "yes\n" -+fts_library=false -+else -+printf "no\n" -+printf "checking whether we have fts available from libfts... " -+if $CC -lfts -o /dev/null "$tmpc" >/dev/null 2>&1 ; then -+printf "yes\n" -+fts_library=true -+else -+printf "no\n" -+echo "fts not in libc and libfts not found." -+exit 1 -+fi -+fi -+ -+rm $tmpc - - cat > Makefile.inc.$$ <<EOF - prefix ?= ${prefix} -@@ -70,6 +101,13 @@ - KMOD_LIBS ?= $(${PKG_CONFIG} --libs " libkmod >= 15 ") - EOF - -+if $fts_library ; then -+cat >> Makefile.inc.$$ <<EOF -+FTS_CFLAGS ?= $(${PKG_CONFIG} --cflags " fts-standalone ") -+FTS_LIBS ?= $(${PKG_CONFIG} --libs " fts-standalone ") -+EOF -+fi -+ - { - [[ $programprefix ]] && echo "programprefix ?= ${programprefix}" - [[ $execprefix ]] && echo "execprefix ?= ${execprefix}" diff --git a/sys-kernel/dracut/files/dracut-046-libfts.patch b/sys-kernel/dracut/files/dracut-046-libfts.patch deleted file mode 100644 index 6eeb73b..0000000 --- a/sys-kernel/dracut/files/dracut-046-libfts.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -Naur dracut-046.orig/Makefile dracut-046/Makefile ---- dracut-046.orig/Makefile 2017-08-11 04:44:06.000000000 -0700 -+++ dracut-046/Makefile 2017-11-20 10:47:53.667837476 -0800 -@@ -13,7 +13,7 @@ - bindir ?= ${prefix}/bin - mandir ?= ${prefix}/share/man - CFLAGS ?= -O2 -g -Wall --CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 $(KMOD_CFLAGS) -+CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 $(KMOD_CFLAGS) $(FTS_CFLAGS) - bashcompletiondir ?= ${datadir}/bash-completion/completions - pkgconfigdatadir ?= $(datadir)/pkgconfig - -@@ -61,7 +61,7 @@ - install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h install/log.h - - install/dracut-install: $(DRACUT_INSTALL_OBJECTS) -- $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS) -+ $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS) $(FTS_LIBS) - - dracut-install: install/dracut-install - ln -fs $< $@ -diff -Naur dracut-046.orig/configure dracut-046/configure ---- dracut-046.orig/configure 2017-08-11 04:44:06.000000000 -0700 -+++ dracut-046/configure 2017-11-20 10:49:33.023835696 -0800 -@@ -7,6 +7,7 @@ - - enable_documentation=yes - -+CC="${CC:-gcc}" - PKG_CONFIG="${PKG_CONFIG:-pkg-config}" - - # Little helper function for reading args from the commandline. -@@ -52,10 +53,40 @@ - shift - done - -+printf "checking for libkmod... " - if ! ${PKG_CONFIG} --exists --print-errors " libkmod >= 15 "; then -+ printf "no\n" - echo "dracut needs pkg-config and libkmod >= 15." >&2 - exit 1 - fi -+printf "yes\n" -+ -+tmpc="./conftest.c" -+ -+printf "checking whether we have fts available from libc... " -+echo '#if !defined(__x86_64__)' > "$tmpc" -+echo '#undef _FILE_OFFSET_BITS' >> "$tmpc" -+echo '#define _FILE_OFFSET_BITS 32' >> "$tmpc" -+echo '#endif' >> "$tmpc" -+echo '#include <fts.h>' >> "$tmpc" -+echo 'int main() { FTS* fts = 0; return fts_close(fts); return 0; }' >> "$tmpc" -+if $CC -o /dev/null "$tmpc" >/dev/null 2>&1 ; then -+printf "yes\n" -+fts_library=false -+else -+printf "no\n" -+printf "checking whether we have fts available from libfts... " -+if $CC -lfts -o /dev/null "$tmpc" >/dev/null 2>&1 ; then -+printf "yes\n" -+fts_library=true -+else -+printf "no\n" -+echo "fts not in libc and libfts not found." -+exit 1 -+fi -+fi -+ -+rm $tmpc - - cat > Makefile.inc.$$ <<EOF - prefix ?= ${prefix} -@@ -70,6 +101,13 @@ - KMOD_LIBS ?= $(${PKG_CONFIG} --libs " libkmod >= 15 ") - EOF - -+if $fts_library ; then -+cat >> Makefile.inc.$$ <<EOF -+FTS_CFLAGS ?= $(${PKG_CONFIG} --cflags " fts-standalone ") -+FTS_LIBS ?= $(${PKG_CONFIG} --libs " fts-standalone ") -+EOF -+fi -+ - { - [[ $programprefix ]] && echo "programprefix ?= ${programprefix}" - [[ $execprefix ]] && echo "execprefix ?= ${execprefix}" diff --git a/sys-kernel/dracut/files/dracut-047-libfts.patch b/sys-kernel/dracut/files/dracut-047-libfts.patch deleted file mode 100644 index 4d67f12..0000000 --- a/sys-kernel/dracut/files/dracut-047-libfts.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -Naur dracut-047.orig/Makefile dracut-047/Makefile ---- dracut-047.orig/Makefile 2018-03-09 17:50:16.951255993 -0800 -+++ dracut-047/Makefile 2018-03-09 17:50:21.034255919 -0800 -@@ -13,7 +13,7 @@ - bindir ?= ${prefix}/bin - mandir ?= ${prefix}/share/man - CFLAGS ?= -O2 -g -Wall --CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 $(KMOD_CFLAGS) -+CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 $(KMOD_CFLAGS) $(FTS_CFLAGS) - bashcompletiondir ?= ${datadir}/bash-completion/completions - pkgconfigdatadir ?= $(datadir)/pkgconfig - -@@ -61,7 +61,7 @@ - install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h install/log.h - - install/dracut-install: $(DRACUT_INSTALL_OBJECTS) -- $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS) -+ $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS) $(FTS_LIBS) - - dracut-install: install/dracut-install - ln -fs $< $@ -diff -Naur dracut-047.orig/configure dracut-047/configure ---- dracut-047.orig/configure 2018-03-09 17:50:16.951255993 -0800 -+++ dracut-047/configure 2018-03-09 17:51:16.447254927 -0800 -@@ -7,6 +7,7 @@ - - enable_documentation=yes - -+CC="${CC:-gcc}" - PKG_CONFIG="${PKG_CONFIG:-pkg-config}" - - # Little helper function for reading args from the commandline. -@@ -52,10 +53,40 @@ - shift - done - -+printf "checking for libkmod... " - if ! ${PKG_CONFIG} --exists --print-errors " libkmod >= 23 "; then -+ printf "no\n" - echo "dracut needs pkg-config and libkmod >= 23." >&2 - exit 1 - fi -+printf "yes\n" -+ -+tmpc="./conftest.c" -+ -+printf "checking whether we have fts available from libc... " -+echo '#if !defined(__x86_64__)' > "$tmpc" -+echo '#undef _FILE_OFFSET_BITS' >> "$tmpc" -+echo '#define _FILE_OFFSET_BITS 32' >> "$tmpc" -+echo '#endif' >> "$tmpc" -+echo '#include <fts.h>' >> "$tmpc" -+echo 'int main() { FTS* fts = 0; return fts_close(fts); return 0; }' >> "$tmpc" -+if $CC -o /dev/null "$tmpc" >/dev/null 2>&1 ; then -+printf "yes\n" -+fts_library=false -+else -+printf "no\n" -+printf "checking whether we have fts available from libfts... " -+if $CC -lfts -o /dev/null "$tmpc" >/dev/null 2>&1 ; then -+printf "yes\n" -+fts_library=true -+else -+printf "no\n" -+echo "fts not in libc and libfts not found." -+exit 1 -+fi -+fi -+ -+rm $tmpc - - cat > Makefile.inc.$$ <<EOF - prefix ?= ${prefix} -@@ -70,6 +101,13 @@ - KMOD_LIBS ?= $(${PKG_CONFIG} --libs " libkmod >= 23 ") - EOF - -+if $fts_library ; then -+cat >> Makefile.inc.$$ <<EOF -+FTS_CFLAGS ?= $(${PKG_CONFIG} --cflags " fts-standalone ") -+FTS_LIBS ?= $(${PKG_CONFIG} --libs " fts-standalone ") -+EOF -+fi -+ - { - [[ $programprefix ]] && echo "programprefix ?= ${programprefix}" - [[ $execprefix ]] && echo "execprefix ?= ${execprefix}" diff --git a/sys-kernel/dracut/files/dracut-sys-reg_h.patch b/sys-kernel/dracut/files/dracut-sys-reg_h.patch deleted file mode 100644 index 9cf7cfc..0000000 --- a/sys-kernel/dracut/files/dracut-sys-reg_h.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur dracut-046.orig/install/util.h dracut-046/install/util.h ---- dracut-046.orig/install/util.h 2017-08-11 11:44:06.000000000 +0000 -+++ dracut-046/install/util.h 2018-03-30 21:33:00.720715093 +0000 -@@ -36,6 +36,7 @@ - #include <sys/stat.h> - #include <dirent.h> - #include <sys/resource.h> -+#include <sys/reg.h> - - #include "macro.h" - diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml deleted file mode 100644 index 153efe6..0000000 --- a/sys-kernel/dracut/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>chutz...@gentoo.org</email> - <name>Patrick McLean</name> - </maintainer> - <maintainer type="person"> - <email>alexan...@tsoy.me</email> - <name>Alexander Tsoy</name> - </maintainer> - <maintainer type="person"> - <email>flop...@gentoo.org</email> - <name>Mike Gilbert</name> - </maintainer> - <use> - <flag name="debug">Module installing additional tools like strace, file - editor, ssh and more</flag> - </use> - <longdescription lang="en"> - Generic, modular initramfs generation tool that can be used across various - distributions. - </longdescription> -</pkgmetadata>