1 |
commit: 6b22b05ef1d15b6763e25d118ea2fb0efc1c6009 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Mar 25 15:27:06 2018 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Sun Mar 25 15:27:06 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=6b22b05e |
7 |
|
8 |
sys-kernel/dracut: version bump to 047-r1 |
9 |
|
10 |
sys-kernel/dracut/dracut-046-r1.ebuild | 2 +- |
11 |
.../{dracut-047.ebuild => dracut-047-r1.ebuild} | 7 +- |
12 |
.../047-all-fix-issues-found-by-shellcheck.patch | 77 ++++++++++++++++++++++ |
13 |
...mouth-fix-detection-of-plymouth-directory.patch | 31 +++++++++ |
14 |
4 files changed, 115 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/sys-kernel/dracut/dracut-046-r1.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild |
17 |
index db58301..83b00eb 100644 |
18 |
--- a/sys-kernel/dracut/dracut-046-r1.ebuild |
19 |
+++ b/sys-kernel/dracut/dracut-046-r1.ebuild |
20 |
@@ -10,7 +10,7 @@ HOMEPAGE="https://dracut.wiki.kernel.org" |
21 |
SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" |
22 |
LICENSE="GPL-2" |
23 |
SLOT="0" |
24 |
-KEYWORDS="amd64 ~arm ia64 ~mips ~ppc sparc x86" |
25 |
+KEYWORDS="amd64 ~arm ia64 ~mips ppc sparc x86" |
26 |
IUSE="debug selinux" |
27 |
|
28 |
RESTRICT="test" |
29 |
|
30 |
diff --git a/sys-kernel/dracut/dracut-047.ebuild b/sys-kernel/dracut/dracut-047-r1.ebuild |
31 |
similarity index 96% |
32 |
rename from sys-kernel/dracut/dracut-047.ebuild |
33 |
rename to sys-kernel/dracut/dracut-047-r1.ebuild |
34 |
index 977b3ce..8f58b6c 100644 |
35 |
--- a/sys-kernel/dracut/dracut-047.ebuild |
36 |
+++ b/sys-kernel/dracut/dracut-047-r1.ebuild |
37 |
@@ -47,12 +47,14 @@ DEPEND="${COMMON_DEPEND} |
38 |
" |
39 |
|
40 |
DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
41 |
- README.testsuite TODO dracut.html ) |
42 |
+ README.testsuite TODO ) |
43 |
|
44 |
QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
45 |
|
46 |
PATCHES=( |
47 |
"${FILESDIR}/045-systemdutildir.patch" |
48 |
+ "${FILESDIR}/047-all-fix-issues-found-by-shellcheck.patch" |
49 |
+ "${FILESDIR}/047-plymouth-fix-detection-of-plymouth-directory.patch" |
50 |
"${FILESDIR}"/${P}-libfts.patch |
51 |
) |
52 |
|
53 |
@@ -86,6 +88,9 @@ src_install() { |
54 |
|
55 |
insinto /etc/logrotate.d |
56 |
newins dracut.logrotate dracut |
57 |
+ |
58 |
+ docinto html |
59 |
+ dodoc dracut.html |
60 |
} |
61 |
|
62 |
pkg_postinst() { |
63 |
|
64 |
diff --git a/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch b/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch |
65 |
new file mode 100644 |
66 |
index 0000000..d5cbe04 |
67 |
--- /dev/null |
68 |
+++ b/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch |
69 |
@@ -0,0 +1,77 @@ |
70 |
+From 3aa37cafde734719f2377600a17459fad30edfbc Mon Sep 17 00:00:00 2001 |
71 |
+From: Lukas Nykryn <lnykryn@××××××.com> |
72 |
+Date: Fri, 2 Mar 2018 12:29:46 +0100 |
73 |
+Subject: [PATCH 06/14] all: fix issues found by shellcheck |
74 |
+To: <initramfs@×××××××××××.org> |
75 |
+ |
76 |
+Error: SHELLCHECK_WARNING: |
77 |
+/usr/lib/dracut/dracut-init.sh:939:20: error: Argument to implicit -n is always true due to literal strings. [SC2157] |
78 |
+ 937| dracut_kernel_post() { |
79 |
+ 938| for _f in modules.builtin.bin modules.builtin modules.order; do |
80 |
+ 939|-> [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" |
81 |
+ 940| done |
82 |
+ 941| |
83 |
+ |
84 |
+Error: SHELLCHECK_WARNING: |
85 |
+/usr/lib/dracut/modules.d/98syslog/parse-syslog-opts.sh:18:12: error: This expression is constant. Did you forget a $ somewhere? [SC2078] |
86 |
+ 16| elif [ -e /sbin/syslogd ]; then |
87 |
+ 17| syslogtype="syslogd" |
88 |
+ 18|-> elif [ /sbin/syslog-ng ]; then |
89 |
+ 19| syslogtype="syslog-ng" |
90 |
+ 20| else |
91 |
+ |
92 |
+Error: SHELLCHECK_WARNING: |
93 |
+/usr/lib/dracut/modules.d/90crypt/crypt-lib.sh:15:29: error: Since you double quoted this, it will not word split, and the loop will only run once. [SC2066] |
94 |
+ 13| strstr "$d" "${luks##luks-}" && return 0 |
95 |
+ 14| if [ -n "$dev" ]; then |
96 |
+ 15|-> for _dev in "$(devnames $d)"; do |
97 |
+ 16| [ "$dev" -ef "$_dev" ] && return 0 |
98 |
+ 17| done |
99 |
+--- |
100 |
+ dracut-init.sh | 2 +- |
101 |
+ modules.d/90crypt/crypt-lib.sh | 2 +- |
102 |
+ modules.d/98syslog/parse-syslog-opts.sh | 2 +- |
103 |
+ 3 files changed, 3 insertions(+), 3 deletions(-) |
104 |
+ |
105 |
+diff --git a/dracut-init.sh b/dracut-init.sh |
106 |
+index 53e6f13a..1278c638 100644 |
107 |
+--- a/dracut-init.sh |
108 |
++++ b/dracut-init.sh |
109 |
+@@ -942,7 +942,7 @@ for_each_kmod_dep() { |
110 |
+ |
111 |
+ dracut_kernel_post() { |
112 |
+ for _f in modules.builtin.bin modules.builtin modules.order; do |
113 |
+- [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" |
114 |
++ [[ -e $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" |
115 |
+ done |
116 |
+ |
117 |
+ # generate module dependencies for the initrd |
118 |
+diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh |
119 |
+index 532b9a71..bbf485e0 100755 |
120 |
+--- a/modules.d/90crypt/crypt-lib.sh |
121 |
++++ b/modules.d/90crypt/crypt-lib.sh |
122 |
+@@ -12,7 +12,7 @@ crypttab_contains() { |
123 |
+ strstr "${l##luks-}" "${luks##luks-}" && return 0 |
124 |
+ strstr "$d" "${luks##luks-}" && return 0 |
125 |
+ if [ -n "$dev" ]; then |
126 |
+- for _dev in "$(devnames $d)"; do |
127 |
++ for _dev in $(devnames $d); do |
128 |
+ [ "$dev" -ef "$_dev" ] && return 0 |
129 |
+ done |
130 |
+ fi |
131 |
+diff --git a/modules.d/98syslog/parse-syslog-opts.sh b/modules.d/98syslog/parse-syslog-opts.sh |
132 |
+index 50ec2759..9ec6ad47 100755 |
133 |
+--- a/modules.d/98syslog/parse-syslog-opts.sh |
134 |
++++ b/modules.d/98syslog/parse-syslog-opts.sh |
135 |
+@@ -15,7 +15,7 @@ detect_syslog() { |
136 |
+ syslogtype="rsyslogd" |
137 |
+ elif [ -e /sbin/syslogd ]; then |
138 |
+ syslogtype="syslogd" |
139 |
+- elif [ /sbin/syslog-ng ]; then |
140 |
++ elif [ -e /sbin/syslog-ng ]; then |
141 |
+ syslogtype="syslog-ng" |
142 |
+ else |
143 |
+ warn "Could not find any syslog binary although the syslogmodule is selected to be installed. Please check." |
144 |
+-- |
145 |
+2.16.1 |
146 |
+ |
147 |
|
148 |
diff --git a/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch b/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch |
149 |
new file mode 100644 |
150 |
index 0000000..42f8772 |
151 |
--- /dev/null |
152 |
+++ b/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch |
153 |
@@ -0,0 +1,31 @@ |
154 |
+From fe6c7e0f06cde65effb3503a47c31ac39aceefb6 Mon Sep 17 00:00:00 2001 |
155 |
+From: Alexander Tsoy <alexander@××××.me> |
156 |
+Date: Fri, 23 Mar 2018 11:52:27 +0300 |
157 |
+Subject: [PATCH 14/14] plymouth: fix detection of plymouth directory |
158 |
+To: <initramfs@×××××××××××.org> |
159 |
+ |
160 |
+Some distros have both /usr/lib/plymouth and /usr/libexec/plymouth |
161 |
+directorirs, so we should check the existance of plymouth-populate-initrd |
162 |
+script. |
163 |
+ |
164 |
+Fixes: 421b46f8ae89cfe2b62e880a8a5079ee8c1b3aae |
165 |
+--- |
166 |
+ modules.d/50plymouth/module-setup.sh | 2 +- |
167 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
168 |
+ |
169 |
+diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh |
170 |
+index 5fbca8b0..b51913e8 100755 |
171 |
+--- a/modules.d/50plymouth/module-setup.sh |
172 |
++++ b/modules.d/50plymouth/module-setup.sh |
173 |
+@@ -6,7 +6,7 @@ pkglib_dir() { |
174 |
+ _dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth" |
175 |
+ fi |
176 |
+ for _dir in $_dirs; do |
177 |
+- if [ -d $_dir ]; then |
178 |
++ if [ -x $_dir/plymouth-populate-initrd ]; then |
179 |
+ echo $_dir |
180 |
+ return |
181 |
+ fi |
182 |
+-- |
183 |
+2.16.1 |
184 |
+ |