commit: f30dbf7b701c34c264f14980f730477dc7b97005
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Jul 6 17:31:53 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Jul 6 17:31:53 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f30dbf7b
sys-kernel/dracut: version bump to 045-r2
sys-kernel/dracut/Manifest | 3 +-
.../{dracut-045.ebuild => dracut-045-r2.ebuild} | 3 +-
sys-kernel/dracut/files/045-systemdutildir.patch | 45 ++++++++++++++++++++++
3 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 481a285..96187f9 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,4 +1,5 @@
+AUX 045-systemdutildir.patch 1665 SHA256
9a2a9e8a1486945f5639a25abca9c06c445de41dbdd261f30f2e7944c21772c4 SHA512
f576cd166e9ad03ffa8317dcffcd7c6f920ffa92251eaacc5c2a95e4ca88687bd1870c8f75ecf3b5fc81773f2d3e082dff647d6a313d183a6017fc79b7bc604b
WHIRLPOOL
a4494844ad2bc1d87f599b56b0d8799c3972c2c65b1b9e8d099180dd7d3126e2c74d21736071c0e59fdca08d799ebf5787a4601f3a94a7c903fa90ddbb5c2a2c
AUX dracut-045-libfts.patch 2744 SHA256
49151e4f1f1042f9cdc7caa2388f0785526f27820323ca02dc65f6ed61d7d611 SHA512
cb94e734471118c414c8f78b1e528fb19712e1eb4ccec6999bb1e9e57c239647a5205b63dff69b4f921c6ac6eddfc3c3c6ffef973bff6acd690365a3fe245d56
WHIRLPOOL
1170ee991d4dc6f1066737a2fe46e2bf200b537151c4e5ba8c0ec7f0b92cda834e7779004918df21845a2441bc454874a00d7f5532490aaed4ee758278e75039
DIST dracut-045.tar.xz 292652 SHA256
ca9c7ea54d3efc8b57ac1427cc5fa4d66688f6cf9d3088f4c5e7ae7c7e84ebf8 SHA512
b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a
WHIRLPOOL
d9cdf32e4fb745b2598aa2f0504c943f5a069dddc17d5261d594b2fc33921306196386bc35156d5bf71983cc15be3b0cddd504d1b6a2042b45b5c5ae622b23b9
-EBUILD dracut-045.ebuild 4822 SHA256
f843b16a682e4d9fca90398c9509e48c26e6d1f3b54b54d7416ef24bffb9c40b SHA512
f2dd17ecbe36fa64f6c5ab84a7c5777636bb0832a22deb274ea01b5e2bc18fdc66c3e526486fc9e4bf59f53d28d60f6935a0b85ad0db17be333688a89a630ed7
WHIRLPOOL
09410575b79ab230cfc3593b78914cb8bc6e7e7549334879b4ab9e14bb22dd0bf5bb04aca97d7c92abc4f3907a909c6ddbcae14beab90e3c4a6af9c29b64809a
+EBUILD dracut-045-r2.ebuild 4865 SHA256
d1c086bf8210c527b678416ae04486fe11deb8a6b60b9003cbc5fd2e71a745ef SHA512
b1ff7afc3c2f6ab6112ac567e6d795118579e0a9cd93952fec01bfa56a6a9992b58577c347d8107b6df1e4b6f37f1950fe698b1f56f54518809740e46615c9f6
WHIRLPOOL
ed33db42f7b3b791a419ff97982bca47dd5d417fc8a01d83f520f852d5f0bcf1137937ce6bd64d56f89b8815c7c553adf3ede98d5569d9553c5d695e923c916c
MISC metadata.xml 840 SHA256
8ef5aab36d95735b3b0b1cdba609ef3cd8e883ac38fb619c957fe5ae1e35bd6d SHA512
d347acc0a7c8b821804280f198aa28cbd4198a8f2d570c2725584b18b04125a684bed6adb48f5cb71fe1ef0e1c19320ad3dbff612dbf972f741b50b91fc388ba
WHIRLPOOL
9edf380512d517d1eb6303a81379e8df8c342c3ab4501b150f2c23078185d09251903b4ea182a65c49caeda51ce21845ba34783875b7c8111883ff3855f0dbac
diff --git a/sys-kernel/dracut/dracut-045.ebuild
b/sys-kernel/dracut/dracut-045-r2.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-045.ebuild
rename to sys-kernel/dracut/dracut-045-r2.ebuild
index 20908ce..f7f3a12 100644
--- a/sys-kernel/dracut/dracut-045.ebuild
+++ b/sys-kernel/dracut/dracut-045-r2.ebuild
@@ -49,9 +49,10 @@ DEPEND="${CDEPEND}
DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
README.testsuite TODO )
-QA_MULTILIB_PATHS="usr/lib/dracut"
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
+ "${FILESDIR}/045-systemdutildir.patch"
"${FILESDIR}"/${P}-libfts.patch
)
diff --git a/sys-kernel/dracut/files/045-systemdutildir.patch
b/sys-kernel/dracut/files/045-systemdutildir.patch
new file mode 100644
index 0000000..e56abba
--- /dev/null
+++ b/sys-kernel/dracut/files/045-systemdutildir.patch
@@ -0,0 +1,45 @@
+From ed5cc98864c28eab2c4cb45ec0f67450699aaaa8 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <[email protected]>
+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
+
