commit: d2232b443f0a608c6a6ea578484187d82dec0573 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jan 26 17:06:12 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jan 26 17:29:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2232b44
sys-kernel/dracut: remove libdirs override This prevents autodetection via ldconfig from working. Closes: https://bugs.gentoo.org/676076 Package-Manager: Portage-2.3.56_p3, Repoman-2.3.12_p50 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../dracut/{dracut-9999.ebuild => dracut-049-r1.ebuild} | 14 +++----------- sys-kernel/dracut/dracut-9999.ebuild | 11 ----------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-049-r1.ebuild similarity index 92% copy from sys-kernel/dracut/dracut-9999.ebuild copy to sys-kernel/dracut/dracut-049-r1.ebuild index 7ccd4d0b0e5..840818b1317 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-049-r1.ebuild @@ -59,6 +59,9 @@ DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( + "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch + "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch + "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch ) src_configure() { @@ -83,17 +86,6 @@ src_configure() { 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 diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 7ccd4d0b0e5..67bf16fda20 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -83,17 +83,6 @@ src_configure() { 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
