| 1 |
commit: d2232b443f0a608c6a6ea578484187d82dec0573 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 26 17:06:12 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 26 17:29:45 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2232b44 |
| 7 |
|
| 8 |
sys-kernel/dracut: remove libdirs override |
| 9 |
|
| 10 |
This prevents autodetection via ldconfig from working. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/676076 |
| 13 |
Package-Manager: Portage-2.3.56_p3, Repoman-2.3.12_p50 |
| 14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 15 |
|
| 16 |
.../dracut/{dracut-9999.ebuild => dracut-049-r1.ebuild} | 14 +++----------- |
| 17 |
sys-kernel/dracut/dracut-9999.ebuild | 11 ----------- |
| 18 |
2 files changed, 3 insertions(+), 22 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-049-r1.ebuild |
| 21 |
similarity index 92% |
| 22 |
copy from sys-kernel/dracut/dracut-9999.ebuild |
| 23 |
copy to sys-kernel/dracut/dracut-049-r1.ebuild |
| 24 |
index 7ccd4d0b0e5..840818b1317 100644 |
| 25 |
--- a/sys-kernel/dracut/dracut-9999.ebuild |
| 26 |
+++ b/sys-kernel/dracut/dracut-049-r1.ebuild |
| 27 |
@@ -59,6 +59,9 @@ DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
| 28 |
QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
| 29 |
|
| 30 |
PATCHES=( |
| 31 |
+ "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch |
| 32 |
+ "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch |
| 33 |
+ "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch |
| 34 |
) |
| 35 |
|
| 36 |
src_configure() { |
| 37 |
@@ -83,17 +86,6 @@ src_configure() { |
| 38 |
src_install() { |
| 39 |
default |
| 40 |
|
| 41 |
- local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) |
| 42 |
- if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then |
| 43 |
- # Preserve lib -> lib64 symlinks in initramfs |
| 44 |
- libdirs+=( /lib /usr/lib ) |
| 45 |
- fi |
| 46 |
- |
| 47 |
- einfo "Setting libdirs to \"${libdirs[*]}\" ..." |
| 48 |
- echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die |
| 49 |
- insinto "/usr/lib/dracut/dracut.conf.d" |
| 50 |
- doins "${T}/gentoo.conf" |
| 51 |
- |
| 52 |
insinto /etc/logrotate.d |
| 53 |
newins dracut.logrotate dracut |
| 54 |
|
| 55 |
|
| 56 |
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild |
| 57 |
index 7ccd4d0b0e5..67bf16fda20 100644 |
| 58 |
--- a/sys-kernel/dracut/dracut-9999.ebuild |
| 59 |
+++ b/sys-kernel/dracut/dracut-9999.ebuild |
| 60 |
@@ -83,17 +83,6 @@ src_configure() { |
| 61 |
src_install() { |
| 62 |
default |
| 63 |
|
| 64 |
- local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) |
| 65 |
- if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then |
| 66 |
- # Preserve lib -> lib64 symlinks in initramfs |
| 67 |
- libdirs+=( /lib /usr/lib ) |
| 68 |
- fi |
| 69 |
- |
| 70 |
- einfo "Setting libdirs to \"${libdirs[*]}\" ..." |
| 71 |
- echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die |
| 72 |
- insinto "/usr/lib/dracut/dracut.conf.d" |
| 73 |
- doins "${T}/gentoo.conf" |
| 74 |
- |
| 75 |
insinto /etc/logrotate.d |
| 76 |
newins dracut.logrotate dracut |
Archives