| 1 |
commit: f30dbf7b701c34c264f14980f730477dc7b97005 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jul 6 17:31:53 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Jul 6 17:31:53 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f30dbf7b |
| 7 |
|
| 8 |
sys-kernel/dracut: version bump to 045-r2 |
| 9 |
|
| 10 |
sys-kernel/dracut/Manifest | 3 +- |
| 11 |
.../{dracut-045.ebuild => dracut-045-r2.ebuild} | 3 +- |
| 12 |
sys-kernel/dracut/files/045-systemdutildir.patch | 45 ++++++++++++++++++++++ |
| 13 |
3 files changed, 49 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest |
| 16 |
index 481a285..96187f9 100644 |
| 17 |
--- a/sys-kernel/dracut/Manifest |
| 18 |
+++ b/sys-kernel/dracut/Manifest |
| 19 |
@@ -1,4 +1,5 @@ |
| 20 |
+AUX 045-systemdutildir.patch 1665 SHA256 9a2a9e8a1486945f5639a25abca9c06c445de41dbdd261f30f2e7944c21772c4 SHA512 f576cd166e9ad03ffa8317dcffcd7c6f920ffa92251eaacc5c2a95e4ca88687bd1870c8f75ecf3b5fc81773f2d3e082dff647d6a313d183a6017fc79b7bc604b WHIRLPOOL a4494844ad2bc1d87f599b56b0d8799c3972c2c65b1b9e8d099180dd7d3126e2c74d21736071c0e59fdca08d799ebf5787a4601f3a94a7c903fa90ddbb5c2a2c |
| 21 |
AUX dracut-045-libfts.patch 2744 SHA256 49151e4f1f1042f9cdc7caa2388f0785526f27820323ca02dc65f6ed61d7d611 SHA512 cb94e734471118c414c8f78b1e528fb19712e1eb4ccec6999bb1e9e57c239647a5205b63dff69b4f921c6ac6eddfc3c3c6ffef973bff6acd690365a3fe245d56 WHIRLPOOL 1170ee991d4dc6f1066737a2fe46e2bf200b537151c4e5ba8c0ec7f0b92cda834e7779004918df21845a2441bc454874a00d7f5532490aaed4ee758278e75039 |
| 22 |
DIST dracut-045.tar.xz 292652 SHA256 ca9c7ea54d3efc8b57ac1427cc5fa4d66688f6cf9d3088f4c5e7ae7c7e84ebf8 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a WHIRLPOOL d9cdf32e4fb745b2598aa2f0504c943f5a069dddc17d5261d594b2fc33921306196386bc35156d5bf71983cc15be3b0cddd504d1b6a2042b45b5c5ae622b23b9 |
| 23 |
-EBUILD dracut-045.ebuild 4822 SHA256 f843b16a682e4d9fca90398c9509e48c26e6d1f3b54b54d7416ef24bffb9c40b SHA512 f2dd17ecbe36fa64f6c5ab84a7c5777636bb0832a22deb274ea01b5e2bc18fdc66c3e526486fc9e4bf59f53d28d60f6935a0b85ad0db17be333688a89a630ed7 WHIRLPOOL 09410575b79ab230cfc3593b78914cb8bc6e7e7549334879b4ab9e14bb22dd0bf5bb04aca97d7c92abc4f3907a909c6ddbcae14beab90e3c4a6af9c29b64809a |
| 24 |
+EBUILD dracut-045-r2.ebuild 4865 SHA256 d1c086bf8210c527b678416ae04486fe11deb8a6b60b9003cbc5fd2e71a745ef SHA512 b1ff7afc3c2f6ab6112ac567e6d795118579e0a9cd93952fec01bfa56a6a9992b58577c347d8107b6df1e4b6f37f1950fe698b1f56f54518809740e46615c9f6 WHIRLPOOL ed33db42f7b3b791a419ff97982bca47dd5d417fc8a01d83f520f852d5f0bcf1137937ce6bd64d56f89b8815c7c553adf3ede98d5569d9553c5d695e923c916c |
| 25 |
MISC metadata.xml 840 SHA256 8ef5aab36d95735b3b0b1cdba609ef3cd8e883ac38fb619c957fe5ae1e35bd6d SHA512 d347acc0a7c8b821804280f198aa28cbd4198a8f2d570c2725584b18b04125a684bed6adb48f5cb71fe1ef0e1c19320ad3dbff612dbf972f741b50b91fc388ba WHIRLPOOL 9edf380512d517d1eb6303a81379e8df8c342c3ab4501b150f2c23078185d09251903b4ea182a65c49caeda51ce21845ba34783875b7c8111883ff3855f0dbac |
| 26 |
|
| 27 |
diff --git a/sys-kernel/dracut/dracut-045.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild |
| 28 |
similarity index 98% |
| 29 |
rename from sys-kernel/dracut/dracut-045.ebuild |
| 30 |
rename to sys-kernel/dracut/dracut-045-r2.ebuild |
| 31 |
index 20908ce..f7f3a12 100644 |
| 32 |
--- a/sys-kernel/dracut/dracut-045.ebuild |
| 33 |
+++ b/sys-kernel/dracut/dracut-045-r2.ebuild |
| 34 |
@@ -49,9 +49,10 @@ DEPEND="${CDEPEND} |
| 35 |
DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
| 36 |
README.testsuite TODO ) |
| 37 |
|
| 38 |
-QA_MULTILIB_PATHS="usr/lib/dracut" |
| 39 |
+QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
| 40 |
|
| 41 |
PATCHES=( |
| 42 |
+ "${FILESDIR}/045-systemdutildir.patch" |
| 43 |
"${FILESDIR}"/${P}-libfts.patch |
| 44 |
) |
| 45 |
|
| 46 |
|
| 47 |
diff --git a/sys-kernel/dracut/files/045-systemdutildir.patch b/sys-kernel/dracut/files/045-systemdutildir.patch |
| 48 |
new file mode 100644 |
| 49 |
index 0000000..e56abba |
| 50 |
--- /dev/null |
| 51 |
+++ b/sys-kernel/dracut/files/045-systemdutildir.patch |
| 52 |
@@ -0,0 +1,45 @@ |
| 53 |
+From ed5cc98864c28eab2c4cb45ec0f67450699aaaa8 Mon Sep 17 00:00:00 2001 |
| 54 |
+From: Mike Gilbert <floppym@g.o> |
| 55 |
+Date: Mon, 3 Jul 2017 22:39:42 -0400 |
| 56 |
+Subject: [PATCH] dracut.sh: improve udevdir and systemdutildir fallback logic |
| 57 |
+ |
| 58 |
+Check for a common binary in systemdutildir. This resolves an issue on |
| 59 |
+split-usr systems, where it is common to have both /lib/systemd[/system] |
| 60 |
+and /usr/lib/systemd[/user] present. |
| 61 |
+ |
| 62 |
+Check for systemd-udevd specifically, since some distros (Gentoo) allow |
| 63 |
+udev to be installed without the rest of the systemd stack. |
| 64 |
+ |
| 65 |
+Similar logic is applied to udevdir simply for consistency. |
| 66 |
+--- |
| 67 |
+ dracut.sh | 8 ++++---- |
| 68 |
+ 1 file changed, 4 insertions(+), 4 deletions(-) |
| 69 |
+ |
| 70 |
+diff --git a/dracut.sh b/dracut.sh |
| 71 |
+index 64d94201..67c12a72 100755 |
| 72 |
+--- a/dracut.sh |
| 73 |
++++ b/dracut.sh |
| 74 |
+@@ -1266,16 +1266,16 @@ done |
| 75 |
+ [[ -d $udevdir ]] \ |
| 76 |
+ || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)" |
| 77 |
+ if ! [[ -d "$udevdir" ]]; then |
| 78 |
+- [[ ! -h /lib ]] && [[ -d /lib/udev ]] && udevdir=/lib/udev |
| 79 |
+- [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev |
| 80 |
++ [[ -e /lib/udev/collect ]] && udevdir=/lib/udev |
| 81 |
++ [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev |
| 82 |
+ fi |
| 83 |
+ |
| 84 |
+ [[ -d $systemdutildir ]] \ |
| 85 |
+ || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null) |
| 86 |
+ |
| 87 |
+ if ! [[ -d "$systemdutildir" ]]; then |
| 88 |
+- [[ ! -h /lib ]] && [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd |
| 89 |
+- [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd |
| 90 |
++ [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd |
| 91 |
++ [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd |
| 92 |
+ fi |
| 93 |
+ |
| 94 |
+ [[ -d $systemdsystemunitdir ]] \ |
| 95 |
+-- |
| 96 |
+2.13.2 |
| 97 |
+ |
Archives