From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 984BA138334 for ; Sat, 26 Jan 2019 17:30:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CB34E0A9B; Sat, 26 Jan 2019 17:29:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18C92E0A9B for ; Sat, 26 Jan 2019 17:29:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67E0F335CC8 for ; Sat, 26 Jan 2019 17:29:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F67650B for ; Sat, 26 Jan 2019 17:29:56 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1548523785.d2232b443f0a608c6a6ea578484187d82dec0573.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut/dracut-049-r1.ebuild sys-kernel/dracut/dracut-9999.ebuild X-VCS-Directories: sys-kernel/dracut/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: d2232b443f0a608c6a6ea578484187d82dec0573 X-VCS-Branch: master Date: Sat, 26 Jan 2019 17:29:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a0acd27a-8b72-4ad6-9a5c-40275c8ebc99 X-Archives-Hash: d67e5ee18eff68d1a4ff64277b99aaee commit: d2232b443f0a608c6a6ea578484187d82dec0573 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jan 26 17:06:12 2019 +0000 Commit: Mike Gilbert gentoo 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 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