1 |
commit: a333ac14261e424907cb1531d1983fba9170a533 |
2 |
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> |
3 |
AuthorDate: Mon Mar 9 23:21:20 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 10 19:49:57 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a333ac14 |
7 |
|
8 |
sys-kernel/dracut: Remove old |
9 |
|
10 |
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/14914 |
13 |
|
14 |
sys-kernel/dracut/Manifest | 4 - |
15 |
sys-kernel/dracut/dracut-044-r1.ebuild | 260 --------------------- |
16 |
sys-kernel/dracut/dracut-044-r3.ebuild | 246 ------------------- |
17 |
sys-kernel/dracut/dracut-045-r2.ebuild | 164 ------------- |
18 |
sys-kernel/dracut/dracut-046-r1.ebuild | 165 ------------- |
19 |
sys-kernel/dracut/dracut-047-r1.ebuild | 154 ------------ |
20 |
sys-kernel/dracut/dracut-048.ebuild | 148 ------------ |
21 |
sys-kernel/dracut/dracut-049-r1.ebuild | 156 ------------- |
22 |
sys-kernel/dracut/dracut-049-r2.ebuild | 157 ------------- |
23 |
sys-kernel/dracut/dracut-049.ebuild | 158 ------------- |
24 |
...-lib.sh-dev_unit_name-guard-against-dev-b.patch | 32 --- |
25 |
...temd-initrd-add-initrd-root-device.target.patch | 24 -- |
26 |
...03-50-dracut.install-use-bin-bash-shebang.patch | 23 -- |
27 |
sys-kernel/dracut/files/045-systemdutildir.patch | 45 ---- |
28 |
sys-kernel/dracut/files/046-amd-microcode.patch | 30 --- |
29 |
.../047-all-fix-issues-found-by-shellcheck.patch | 77 ------ |
30 |
...mouth-fix-detection-of-plymouth-directory.patch | 31 --- |
31 |
sys-kernel/dracut/files/dracut-044-bash-4.4.patch | 80 ------- |
32 |
.../dracut-044-preserve-xattrs-when-copying.patch | 51 ---- |
33 |
19 files changed, 2005 deletions(-) |
34 |
|
35 |
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest |
36 |
index a2441ad9a7f..2435b6db975 100644 |
37 |
--- a/sys-kernel/dracut/Manifest |
38 |
+++ b/sys-kernel/dracut/Manifest |
39 |
@@ -1,7 +1,3 @@ |
40 |
-DIST dracut-044.tar.xz 280004 BLAKE2B 5b9603eb769b542e2d56fae4d0f0fe250e7e60eb9c85f9c7b7a472b9d889a9f323b3ba1cbbeb1d5de10507498542275cd4430695cc8b48426b42c03d0672ea87 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d |
41 |
-DIST dracut-045.tar.xz 292652 BLAKE2B 0e7c57ddca6757d59823afdc4ff23dcb06cc9cec317ece8cca14c5b6dfd2a7984fb8e857f5f48ad61922ba11b4b68944b366bddb02552efb52375f6e12802de7 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a |
42 |
-DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122 |
43 |
-DIST dracut-047.tar.xz 305836 BLAKE2B 18333ae1e24cfbbb6a152bf9ba2c48884821f6a506344259ba56c581a9f3efac7b4c88e8ca149ef1f83347a5e4d59acba61e42b8e0ab3a9e9beb8684d5db28b0 SHA512 03369726b6c2b682d0c9dead7b7dbd1c3989aaf2b4a561015634d33a94e5230d03cb634c3890191b19dd8c1c83389533ae1a46d45d2024ba885e0d2d46c5d035 |
44 |
DIST dracut-048.tar.xz 308484 BLAKE2B b19c8122034a8b40cbc9d09245730900b59691c336f1d231e768786ad64068e0a8daf57ae9a4182ab50d9e1c683c9b7dcac354eb26d8a60f061db78121bc11c7 SHA512 97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0 |
45 |
DIST dracut-049.tar.gz 376857 BLAKE2B e50084164e26aae6de812345cc76782435ec84951b44eea454355d0c65fe84fdd0858733de534bdf018bdfd92922f0be30b74d74be329a918e55d96c5e4d4fb6 SHA512 51489570856538588868a66c7bcc8a3728574592529905484526c523398dc1b8f1416e6b264780303acd08d818417a9668b76f1d64d3194432b5af79dc15c9f7 |
46 |
DIST dracut-050.tar.xz 333592 BLAKE2B cb0bfa5a8e7547260b8a80a3606eb284182c062926269c85b09e07d26ad177df0eeaa64b17005bff9290611f1c83fc8cd8e2216cfe14b5e66ec7f659d4c2fa7b SHA512 eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850 |
47 |
|
48 |
diff --git a/sys-kernel/dracut/dracut-044-r1.ebuild b/sys-kernel/dracut/dracut-044-r1.ebuild |
49 |
deleted file mode 100644 |
50 |
index 32bb71fb537..00000000000 |
51 |
--- a/sys-kernel/dracut/dracut-044-r1.ebuild |
52 |
+++ /dev/null |
53 |
@@ -1,260 +0,0 @@ |
54 |
-# Copyright 1999-2020 Gentoo Authors |
55 |
-# Distributed under the terms of the GNU General Public License v2 |
56 |
- |
57 |
-EAPI=5 |
58 |
- |
59 |
-inherit bash-completion-r1 eutils linux-info multilib systemd toolchain-funcs |
60 |
- |
61 |
-DESCRIPTION="Generic initramfs generation tool" |
62 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
63 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" |
64 |
- |
65 |
-LICENSE="GPL-2" |
66 |
-SLOT="0" |
67 |
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86" |
68 |
-IUSE="debug selinux systemd" |
69 |
- |
70 |
-RESTRICT="test" |
71 |
- |
72 |
-CDEPEND="virtual/udev |
73 |
- systemd? ( >=sys-apps/systemd-199 ) |
74 |
- " |
75 |
-RDEPEND="${CDEPEND} |
76 |
- app-arch/cpio |
77 |
- >=app-shells/bash-4.0 |
78 |
- >sys-apps/kmod-5[tools] |
79 |
- || ( |
80 |
- >=sys-apps/sysvinit-2.87-r3 |
81 |
- sys-apps/systemd[sysv-utils] |
82 |
- ) |
83 |
- >=sys-apps/util-linux-2.21 |
84 |
- |
85 |
- debug? ( dev-util/strace ) |
86 |
- selinux? ( |
87 |
- sys-libs/libselinux |
88 |
- sys-libs/libsepol |
89 |
- sec-policy/selinux-dracut |
90 |
- ) |
91 |
- !>=app-shells/bash-4.4" |
92 |
-DEPEND="${CDEPEND} |
93 |
- app-text/asciidoc |
94 |
- >=dev-libs/libxslt-1.1.26 |
95 |
- app-text/docbook-xml-dtd:4.5 |
96 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
97 |
- virtual/pkgconfig |
98 |
- " |
99 |
- |
100 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
101 |
- README.testsuite TODO ) |
102 |
-MY_LIBDIR=/usr/lib |
103 |
-QA_MULTILIB_PATHS=" |
104 |
- usr/lib/dracut/dracut-install |
105 |
- usr/lib/dracut/skipcpio |
106 |
- " |
107 |
- |
108 |
-PATCHES=( |
109 |
- "${FILESDIR}"/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch |
110 |
- "${FILESDIR}"/044-0002-systemd-initrd-add-initrd-root-device.target.patch |
111 |
- "${FILESDIR}"/044-0003-50-dracut.install-use-bin-bash-shebang.patch |
112 |
-) |
113 |
- |
114 |
-# |
115 |
-# Helper functions |
116 |
-# |
117 |
- |
118 |
-# Removes module from modules.d. |
119 |
-# $1 = module name |
120 |
-# Module name can be specified without number prefix. |
121 |
-rm_module() { |
122 |
- local force m |
123 |
- [[ $1 = -f ]] && force=-f |
124 |
- |
125 |
- for m in $@; do |
126 |
- if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then |
127 |
- rm ${force} --interactive=never -r "${modules_dir}"/$m |
128 |
- else |
129 |
- rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m |
130 |
- fi |
131 |
- done |
132 |
-} |
133 |
- |
134 |
-src_prepare() { |
135 |
- local libdirs="/$(get_libdir) /usr/$(get_libdir)" |
136 |
- if [[ ${SYMLINK_LIB} = yes ]]; then |
137 |
- # Preserve lib -> lib64 symlinks in initramfs |
138 |
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" |
139 |
- fi |
140 |
- einfo "Setting libdirs to \"${libdirs}\" ..." |
141 |
- sed -e "3alibdirs=\"${libdirs}\"" \ |
142 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
143 |
- |
144 |
- local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" |
145 |
- einfo "Setting udevdir to ${udevdir}..." |
146 |
- sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ |
147 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
148 |
- |
149 |
- if use systemd; then |
150 |
- local systemdutildir="$(systemd_get_utildir)" |
151 |
- local systemdsystemunitdir="$(systemd_get_unitdir)" |
152 |
- local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ |
153 |
- --variable=systemdsystemconfdir)" |
154 |
- [[ ${systemdsystemconfdir} ]] \ |
155 |
- || systemdsystemconfdir=/etc/systemd/system |
156 |
- einfo "Setting systemdutildir to ${systemdutildir} and ..." |
157 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
158 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
159 |
- einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." |
160 |
- sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ |
161 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
162 |
- einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." |
163 |
- sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ |
164 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
165 |
- else |
166 |
- local systemdutildir="/lib/systemd" |
167 |
- einfo "Setting systemdutildir for standalone udev to" \ |
168 |
- "${systemdutildir}..." |
169 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
170 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
171 |
- fi |
172 |
- |
173 |
- epatch "${PATCHES[@]}" |
174 |
- |
175 |
- epatch_user |
176 |
-} |
177 |
- |
178 |
-src_configure() { |
179 |
- local myconf=( |
180 |
- --libdir="${MY_LIBDIR}" |
181 |
- --bashcompletiondir="$(get_bashcompdir)" |
182 |
- ) |
183 |
- |
184 |
- if use systemd; then |
185 |
- myconf+=( --systemdsystemunitdir="$(systemd_get_unitdir)" ) |
186 |
- fi |
187 |
- |
188 |
- econf "${myconf[@]}" |
189 |
-} |
190 |
- |
191 |
-src_compile() { |
192 |
- tc-export CC |
193 |
- emake doc install/dracut-install skipcpio/skipcpio |
194 |
-} |
195 |
- |
196 |
-src_install() { |
197 |
- default |
198 |
- |
199 |
- local my_libdir="${MY_LIBDIR}" |
200 |
- local dracutlibdir="${my_libdir#/}/dracut" |
201 |
- |
202 |
- echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh" |
203 |
- |
204 |
- insinto "${dracutlibdir}/dracut.conf.d/" |
205 |
- newins dracut.conf.d/gentoo.conf.example gentoo.conf |
206 |
- |
207 |
- insinto /etc/logrotate.d |
208 |
- newins dracut.logrotate dracut |
209 |
- |
210 |
- dodir /var/lib/dracut/overlay |
211 |
- |
212 |
- dohtml dracut.html |
213 |
- |
214 |
- if ! use systemd; then |
215 |
- # Scripts in kernel/install.d are systemd-specific |
216 |
- rm -r "${D%/}/${my_libdir}/kernel" || die |
217 |
- fi |
218 |
- |
219 |
- # |
220 |
- # Modules |
221 |
- # |
222 |
- local module |
223 |
- modules_dir="${D%/}/${dracutlibdir}/modules.d" |
224 |
- |
225 |
- use debug || rm_module 95debug |
226 |
- use selinux || rm_module 98selinux |
227 |
- |
228 |
- if use systemd; then |
229 |
- # With systemd following modules do not make sense |
230 |
- rm_module 96securityfs 97masterkey 98integrity |
231 |
- else |
232 |
- rm_module 00systemd 98dracut-systemd |
233 |
- # Without systemd following modules do not make sense |
234 |
- rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd |
235 |
- fi |
236 |
- |
237 |
- # Remove modules which won't work for sure |
238 |
- rm_module 95fcoe # no tools |
239 |
- # fips module depends on masked app-crypt/hmaccalc |
240 |
- rm_module 01fips 02fips-aesni |
241 |
-} |
242 |
- |
243 |
-pkg_postinst() { |
244 |
- if linux-info_get_any_version && linux_config_exists; then |
245 |
- ewarn "" |
246 |
- ewarn "If the following test report contains a missing kernel" |
247 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
248 |
- ewarn "kernel before booting image generated with this Dracut version." |
249 |
- ewarn "" |
250 |
- |
251 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
252 |
- |
253 |
- # Kernel configuration options descriptions: |
254 |
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" |
255 |
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ |
256 |
-"(initramfs/initrd) support" |
257 |
- |
258 |
- local opt desc |
259 |
- |
260 |
- # Generate ERROR_* variables for check_extra_config. |
261 |
- for opt in ${CONFIG_CHECK}; do |
262 |
- opt=${opt#\~} |
263 |
- desc=desc_${opt} |
264 |
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ |
265 |
- "is missing and REQUIRED'" |
266 |
- done |
267 |
- |
268 |
- check_extra_config |
269 |
- echo |
270 |
- else |
271 |
- ewarn "" |
272 |
- ewarn "Your kernel configuration couldn't be checked. Do you have" |
273 |
- ewarn "/usr/src/linux/.config file there? Please check manually if" |
274 |
- ewarn "following options are enabled:" |
275 |
- ewarn "" |
276 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
277 |
- ewarn " CONFIG_DEVTMPFS" |
278 |
- ewarn "" |
279 |
- fi |
280 |
- |
281 |
- elog "To get additional features, a number of optional runtime" |
282 |
- elog "dependencies may be installed:" |
283 |
- elog "" |
284 |
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
285 |
- sys-apps/iproute2 |
286 |
- optfeature \ |
287 |
- "Measure performance of the boot process for later visualisation" \ |
288 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
289 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
290 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
291 |
- sys-libs/libcap |
292 |
- optfeature "Support CIFS" net-fs/cifs-utils |
293 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
294 |
- "sys-fs/cryptsetup[-static-libs]" |
295 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
296 |
- app-crypt/gnupg |
297 |
- optfeature \ |
298 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
299 |
- app-shells/dash |
300 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
301 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
302 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
303 |
- sys-fs/mdadm |
304 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
305 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
306 |
- optfeature "Support network block devices" sys-block/nbd |
307 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
308 |
- optfeature \ |
309 |
- "Install ssh and scp along with config files and specified keys" \ |
310 |
- net-misc/openssh |
311 |
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
312 |
- app-admin/rsyslog |
313 |
-} |
314 |
|
315 |
diff --git a/sys-kernel/dracut/dracut-044-r3.ebuild b/sys-kernel/dracut/dracut-044-r3.ebuild |
316 |
deleted file mode 100644 |
317 |
index 282b0fb417b..00000000000 |
318 |
--- a/sys-kernel/dracut/dracut-044-r3.ebuild |
319 |
+++ /dev/null |
320 |
@@ -1,246 +0,0 @@ |
321 |
-# Copyright 1999-2018 Gentoo Authors |
322 |
-# Distributed under the terms of the GNU General Public License v2 |
323 |
- |
324 |
-EAPI=6 |
325 |
- |
326 |
-inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd |
327 |
- |
328 |
-DESCRIPTION="Generic initramfs generation tool" |
329 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
330 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" |
331 |
-LICENSE="GPL-2" |
332 |
-SLOT="0" |
333 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
334 |
-IUSE="debug selinux systemd" |
335 |
- |
336 |
-RESTRICT="test" |
337 |
- |
338 |
-CDEPEND="virtual/udev |
339 |
- systemd? ( |
340 |
- >=sys-apps/systemd-199 |
341 |
- virtual/pkgconfig |
342 |
- ) |
343 |
- " |
344 |
-RDEPEND="${CDEPEND} |
345 |
- app-arch/cpio |
346 |
- >=app-shells/bash-4.0 |
347 |
- >sys-apps/kmod-5[tools] |
348 |
- || ( |
349 |
- >=sys-apps/sysvinit-2.87-r3 |
350 |
- sys-apps/systemd[sysv-utils] |
351 |
- ) |
352 |
- >=sys-apps/util-linux-2.21 |
353 |
- |
354 |
- debug? ( dev-util/strace ) |
355 |
- selinux? ( |
356 |
- sys-libs/libselinux |
357 |
- sys-libs/libsepol |
358 |
- sec-policy/selinux-dracut |
359 |
- ) |
360 |
- " |
361 |
-DEPEND="${CDEPEND} |
362 |
- app-text/asciidoc |
363 |
- >=dev-libs/libxslt-1.1.26 |
364 |
- app-text/docbook-xml-dtd:4.5 |
365 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
366 |
- virtual/pkgconfig |
367 |
- " |
368 |
- |
369 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
370 |
- README.testsuite TODO ) |
371 |
-MY_LIBDIR=/usr/lib |
372 |
-QA_MULTILIB_PATHS=" |
373 |
- usr/lib/dracut/dracut-install |
374 |
- usr/lib/dracut/skipcpio |
375 |
- " |
376 |
- |
377 |
-PATCHES=( |
378 |
- "${FILESDIR}"/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch |
379 |
- "${FILESDIR}"/044-0002-systemd-initrd-add-initrd-root-device.target.patch |
380 |
- "${FILESDIR}"/044-0003-50-dracut.install-use-bin-bash-shebang.patch |
381 |
- "${FILESDIR}"/dracut-044-bash-4.4.patch |
382 |
- "${FILESDIR}"/dracut-044-preserve-xattrs-when-copying.patch |
383 |
-) |
384 |
- |
385 |
-# |
386 |
-# Helper functions |
387 |
-# |
388 |
- |
389 |
-# Removes module from modules.d. |
390 |
-# $1 = module name |
391 |
-# Module name can be specified without number prefix. |
392 |
-rm_module() { |
393 |
- local force m |
394 |
- [[ $1 = -f ]] && force=-f |
395 |
- |
396 |
- for m in $@; do |
397 |
- if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then |
398 |
- rm ${force} --interactive=never -r "${modules_dir}"/$m |
399 |
- else |
400 |
- rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m |
401 |
- fi |
402 |
- done |
403 |
-} |
404 |
- |
405 |
-src_prepare() { |
406 |
- local libdirs="/$(get_libdir) /usr/$(get_libdir)" |
407 |
- if [[ ${SYMLINK_LIB} = yes ]]; then |
408 |
- # Preserve lib -> lib64 symlinks in initramfs |
409 |
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" |
410 |
- fi |
411 |
- einfo "Setting libdirs to \"${libdirs}\" ..." |
412 |
- sed -e "3alibdirs=\"${libdirs}\"" \ |
413 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
414 |
- |
415 |
- local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" |
416 |
- einfo "Setting udevdir to ${udevdir}..." |
417 |
- sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ |
418 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
419 |
- |
420 |
- if ! use systemd; then |
421 |
- local systemdutildir="/lib/systemd" |
422 |
- einfo "Setting systemdutildir for standalone udev to" \ |
423 |
- "${systemdutildir}..." |
424 |
- sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
425 |
- -i "${S}/dracut.conf.d/gentoo.conf.example" || die |
426 |
- fi |
427 |
- |
428 |
- default |
429 |
-} |
430 |
- |
431 |
-src_configure() { |
432 |
- local myconf=( |
433 |
- --libdir="${MY_LIBDIR}" |
434 |
- --bashcompletiondir="$(get_bashcompdir)" |
435 |
- ) |
436 |
- |
437 |
- if use systemd; then |
438 |
- myconf+=( --systemdsystemunitdir="$(systemd_get_systemunitdir)" ) |
439 |
- fi |
440 |
- |
441 |
- econf "${myconf[@]}" |
442 |
-} |
443 |
- |
444 |
-src_compile() { |
445 |
- tc-export CC |
446 |
- emake doc install/dracut-install skipcpio/skipcpio |
447 |
-} |
448 |
- |
449 |
-src_install() { |
450 |
- default |
451 |
- |
452 |
- local my_libdir="${MY_LIBDIR}" |
453 |
- local dracutlibdir="${my_libdir#/}/dracut" |
454 |
- |
455 |
- echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh" |
456 |
- |
457 |
- insinto "${dracutlibdir}/dracut.conf.d/" |
458 |
- newins dracut.conf.d/gentoo.conf.example gentoo.conf |
459 |
- |
460 |
- insinto /etc/logrotate.d |
461 |
- newins dracut.logrotate dracut |
462 |
- |
463 |
- dodir /var/lib/dracut/overlay |
464 |
- |
465 |
- dodoc dracut.html |
466 |
- |
467 |
- if ! use systemd; then |
468 |
- # Scripts in kernel/install.d are systemd-specific |
469 |
- rm -r "${D%/}/${my_libdir}/kernel" || die |
470 |
- fi |
471 |
- |
472 |
- # |
473 |
- # Modules |
474 |
- # |
475 |
- local module |
476 |
- modules_dir="${D%/}/${dracutlibdir}/modules.d" |
477 |
- |
478 |
- use debug || rm_module 95debug |
479 |
- use selinux || rm_module 98selinux |
480 |
- |
481 |
- if use systemd; then |
482 |
- # With systemd following modules do not make sense |
483 |
- rm_module 96securityfs 97masterkey 98integrity |
484 |
- else |
485 |
- rm_module 00systemd 98dracut-systemd |
486 |
- # Without systemd following modules do not make sense |
487 |
- rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd |
488 |
- fi |
489 |
- |
490 |
- # Remove modules which won't work for sure |
491 |
- rm_module 95fcoe # no tools |
492 |
- # fips module depends on masked app-crypt/hmaccalc |
493 |
- rm_module 01fips 02fips-aesni |
494 |
-} |
495 |
- |
496 |
-pkg_postinst() { |
497 |
- if linux-info_get_any_version && linux_config_exists; then |
498 |
- ewarn "" |
499 |
- ewarn "If the following test report contains a missing kernel" |
500 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
501 |
- ewarn "kernel before booting image generated with this Dracut version." |
502 |
- ewarn "" |
503 |
- |
504 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
505 |
- |
506 |
- # Kernel configuration options descriptions: |
507 |
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" |
508 |
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ |
509 |
-"(initramfs/initrd) support" |
510 |
- |
511 |
- local opt desc |
512 |
- |
513 |
- # Generate ERROR_* variables for check_extra_config. |
514 |
- for opt in ${CONFIG_CHECK}; do |
515 |
- opt=${opt#\~} |
516 |
- desc=desc_${opt} |
517 |
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ |
518 |
- "is missing and REQUIRED'" |
519 |
- done |
520 |
- |
521 |
- check_extra_config |
522 |
- echo |
523 |
- else |
524 |
- ewarn "" |
525 |
- ewarn "Your kernel configuration couldn't be checked. Do you have" |
526 |
- ewarn "/usr/src/linux/.config file there? Please check manually if" |
527 |
- ewarn "following options are enabled:" |
528 |
- ewarn "" |
529 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
530 |
- ewarn " CONFIG_DEVTMPFS" |
531 |
- ewarn "" |
532 |
- fi |
533 |
- |
534 |
- elog "To get additional features, a number of optional runtime" |
535 |
- elog "dependencies may be installed:" |
536 |
- elog "" |
537 |
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
538 |
- sys-apps/iproute2 |
539 |
- optfeature \ |
540 |
- "Measure performance of the boot process for later visualisation" \ |
541 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
542 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
543 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
544 |
- sys-libs/libcap |
545 |
- optfeature "Support CIFS" net-fs/cifs-utils |
546 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
547 |
- "sys-fs/cryptsetup[-static-libs]" |
548 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
549 |
- app-crypt/gnupg |
550 |
- optfeature \ |
551 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
552 |
- app-shells/dash |
553 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
554 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
555 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
556 |
- sys-fs/mdadm |
557 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
558 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
559 |
- optfeature "Support network block devices" sys-block/nbd |
560 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
561 |
- optfeature \ |
562 |
- "Install ssh and scp along with config files and specified keys" \ |
563 |
- net-misc/openssh |
564 |
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
565 |
- app-admin/rsyslog |
566 |
-} |
567 |
|
568 |
diff --git a/sys-kernel/dracut/dracut-045-r2.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild |
569 |
deleted file mode 100644 |
570 |
index c8c943b0380..00000000000 |
571 |
--- a/sys-kernel/dracut/dracut-045-r2.ebuild |
572 |
+++ /dev/null |
573 |
@@ -1,164 +0,0 @@ |
574 |
-# Copyright 1999-2020 Gentoo Authors |
575 |
-# Distributed under the terms of the GNU General Public License v2 |
576 |
- |
577 |
-EAPI=6 |
578 |
- |
579 |
-inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd |
580 |
- |
581 |
-DESCRIPTION="Generic initramfs generation tool" |
582 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
583 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" |
584 |
-LICENSE="GPL-2" |
585 |
-SLOT="0" |
586 |
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ~ppc64 sparc x86" |
587 |
-IUSE="debug selinux" |
588 |
- |
589 |
-RESTRICT="test" |
590 |
- |
591 |
-CDEPEND="virtual/udev |
592 |
- virtual/pkgconfig |
593 |
- >=sys-apps/kmod-15[tools] |
594 |
- " |
595 |
-RDEPEND="${CDEPEND} |
596 |
- app-arch/cpio |
597 |
- >=app-shells/bash-4.0:0 |
598 |
- || ( |
599 |
- >=sys-apps/sysvinit-2.87-r3 |
600 |
- sys-apps/systemd[sysv-utils] |
601 |
- ) |
602 |
- sys-apps/coreutils[xattr(-)] |
603 |
- >=sys-apps/util-linux-2.21 |
604 |
- |
605 |
- debug? ( dev-util/strace ) |
606 |
- selinux? ( |
607 |
- sys-libs/libselinux |
608 |
- sys-libs/libsepol |
609 |
- sec-policy/selinux-dracut |
610 |
- ) |
611 |
- !net-analyzer/arping |
612 |
- " |
613 |
-DEPEND="${CDEPEND} |
614 |
- app-text/asciidoc |
615 |
- >=dev-libs/libxslt-1.1.26 |
616 |
- app-text/docbook-xml-dtd:4.5 |
617 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
618 |
- " |
619 |
- |
620 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
621 |
- README.testsuite TODO ) |
622 |
- |
623 |
-QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
624 |
- |
625 |
-PATCHES=( |
626 |
- "${FILESDIR}/045-systemdutildir.patch" |
627 |
-) |
628 |
- |
629 |
-src_configure() { |
630 |
- local myconf=( |
631 |
- --prefix="${EPREFIX}/usr" |
632 |
- --sysconfdir="${EPREFIX}/etc" |
633 |
- --bashcompletiondir="$(get_bashcompdir)" |
634 |
- --systemdsystemunitdir="$(systemd_get_systemunitdir)" |
635 |
- ) |
636 |
- |
637 |
- tc-export CC PKG_CONFIG |
638 |
- |
639 |
- echo ./configure "${myconf[@]}" |
640 |
- ./configure "${myconf[@]}" || die |
641 |
-} |
642 |
- |
643 |
-src_install() { |
644 |
- default |
645 |
- |
646 |
- local dracutlibdir="usr/lib/dracut" |
647 |
- |
648 |
- local libdirs="/$(get_libdir) /usr/$(get_libdir)" |
649 |
- if [[ ${SYMLINK_LIB} = yes ]]; then |
650 |
- # Preserve lib -> lib64 symlinks in initramfs |
651 |
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" |
652 |
- fi |
653 |
- |
654 |
- einfo "Setting libdirs to \"${libdirs}\" ..." |
655 |
- echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf" |
656 |
- insinto "${dracutlibdir}/dracut.conf.d" |
657 |
- doins "${T}/gentoo.conf" |
658 |
- |
659 |
- insinto /etc/logrotate.d |
660 |
- newins dracut.logrotate dracut |
661 |
- |
662 |
- dodir /var/lib/dracut/overlay |
663 |
- |
664 |
- dodoc dracut.html |
665 |
-} |
666 |
- |
667 |
-pkg_postinst() { |
668 |
- if linux-info_get_any_version && linux_config_exists; then |
669 |
- ewarn "" |
670 |
- ewarn "If the following test report contains a missing kernel" |
671 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
672 |
- ewarn "kernel before booting image generated with this Dracut version." |
673 |
- ewarn "" |
674 |
- |
675 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
676 |
- |
677 |
- # Kernel configuration options descriptions: |
678 |
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" |
679 |
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ |
680 |
-"(initramfs/initrd) support" |
681 |
- |
682 |
- local opt desc |
683 |
- |
684 |
- # Generate ERROR_* variables for check_extra_config. |
685 |
- for opt in ${CONFIG_CHECK}; do |
686 |
- opt=${opt#\~} |
687 |
- desc=desc_${opt} |
688 |
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ |
689 |
- "is missing and REQUIRED'" |
690 |
- done |
691 |
- |
692 |
- check_extra_config |
693 |
- echo |
694 |
- else |
695 |
- ewarn "" |
696 |
- ewarn "Your kernel configuration couldn't be checked. Do you have" |
697 |
- ewarn "/usr/src/linux/.config file there? Please check manually if" |
698 |
- ewarn "following options are enabled:" |
699 |
- ewarn "" |
700 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
701 |
- ewarn " CONFIG_DEVTMPFS" |
702 |
- ewarn "" |
703 |
- fi |
704 |
- |
705 |
- elog "To get additional features, a number of optional runtime" |
706 |
- elog "dependencies may be installed:" |
707 |
- elog "" |
708 |
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
709 |
- sys-apps/iproute2 "net-misc/iputils[arping]" |
710 |
- optfeature \ |
711 |
- "Measure performance of the boot process for later visualisation" \ |
712 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
713 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
714 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
715 |
- sys-libs/libcap |
716 |
- optfeature "Support CIFS" net-fs/cifs-utils |
717 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
718 |
- "sys-fs/cryptsetup[-static-libs]" |
719 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
720 |
- app-crypt/gnupg |
721 |
- optfeature \ |
722 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
723 |
- app-shells/dash |
724 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
725 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
726 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
727 |
- sys-fs/mdadm |
728 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
729 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
730 |
- optfeature "Support network block devices" sys-block/nbd |
731 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
732 |
- optfeature \ |
733 |
- "Install ssh and scp along with config files and specified keys" \ |
734 |
- net-misc/openssh |
735 |
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
736 |
- app-admin/rsyslog |
737 |
-} |
738 |
|
739 |
diff --git a/sys-kernel/dracut/dracut-046-r1.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild |
740 |
deleted file mode 100644 |
741 |
index a3a22b665f1..00000000000 |
742 |
--- a/sys-kernel/dracut/dracut-046-r1.ebuild |
743 |
+++ /dev/null |
744 |
@@ -1,165 +0,0 @@ |
745 |
-# Copyright 1999-2020 Gentoo Authors |
746 |
-# Distributed under the terms of the GNU General Public License v2 |
747 |
- |
748 |
-EAPI=6 |
749 |
- |
750 |
-inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd |
751 |
- |
752 |
-DESCRIPTION="Generic initramfs generation tool" |
753 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
754 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" |
755 |
-LICENSE="GPL-2" |
756 |
-SLOT="0" |
757 |
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ~ppc64 sparc x86" |
758 |
-IUSE="debug selinux" |
759 |
- |
760 |
-RESTRICT="test" |
761 |
- |
762 |
-CDEPEND="virtual/udev |
763 |
- virtual/pkgconfig |
764 |
- >=sys-apps/kmod-15[tools] |
765 |
- " |
766 |
-RDEPEND="${CDEPEND} |
767 |
- app-arch/cpio |
768 |
- >=app-shells/bash-4.0:0 |
769 |
- || ( |
770 |
- >=sys-apps/sysvinit-2.87-r3 |
771 |
- sys-apps/systemd[sysv-utils] |
772 |
- ) |
773 |
- sys-apps/coreutils[xattr(-)] |
774 |
- >=sys-apps/util-linux-2.21 |
775 |
- |
776 |
- debug? ( dev-util/strace ) |
777 |
- selinux? ( |
778 |
- sys-libs/libselinux |
779 |
- sys-libs/libsepol |
780 |
- sec-policy/selinux-dracut |
781 |
- ) |
782 |
- !net-analyzer/arping |
783 |
- " |
784 |
-DEPEND="${CDEPEND} |
785 |
- app-text/asciidoc |
786 |
- >=dev-libs/libxslt-1.1.26 |
787 |
- app-text/docbook-xml-dtd:4.5 |
788 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
789 |
- " |
790 |
- |
791 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
792 |
- README.testsuite TODO ) |
793 |
- |
794 |
-QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
795 |
- |
796 |
-PATCHES=( |
797 |
- "${FILESDIR}/045-systemdutildir.patch" |
798 |
- "${FILESDIR}/046-amd-microcode.patch" |
799 |
-) |
800 |
- |
801 |
-src_configure() { |
802 |
- local myconf=( |
803 |
- --prefix="${EPREFIX}/usr" |
804 |
- --sysconfdir="${EPREFIX}/etc" |
805 |
- --bashcompletiondir="$(get_bashcompdir)" |
806 |
- --systemdsystemunitdir="$(systemd_get_systemunitdir)" |
807 |
- ) |
808 |
- |
809 |
- tc-export CC PKG_CONFIG |
810 |
- |
811 |
- echo ./configure "${myconf[@]}" |
812 |
- ./configure "${myconf[@]}" || die |
813 |
-} |
814 |
- |
815 |
-src_install() { |
816 |
- default |
817 |
- |
818 |
- local dracutlibdir="usr/lib/dracut" |
819 |
- |
820 |
- local libdirs="/$(get_libdir) /usr/$(get_libdir)" |
821 |
- if [[ ${SYMLINK_LIB} = yes ]]; then |
822 |
- # Preserve lib -> lib64 symlinks in initramfs |
823 |
- [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" |
824 |
- fi |
825 |
- |
826 |
- einfo "Setting libdirs to \"${libdirs}\" ..." |
827 |
- echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf" |
828 |
- insinto "${dracutlibdir}/dracut.conf.d" |
829 |
- doins "${T}/gentoo.conf" |
830 |
- |
831 |
- insinto /etc/logrotate.d |
832 |
- newins dracut.logrotate dracut |
833 |
- |
834 |
- dodir /var/lib/dracut/overlay |
835 |
- |
836 |
- dodoc dracut.html |
837 |
-} |
838 |
- |
839 |
-pkg_postinst() { |
840 |
- if linux-info_get_any_version && linux_config_exists; then |
841 |
- ewarn "" |
842 |
- ewarn "If the following test report contains a missing kernel" |
843 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
844 |
- ewarn "kernel before booting image generated with this Dracut version." |
845 |
- ewarn "" |
846 |
- |
847 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
848 |
- |
849 |
- # Kernel configuration options descriptions: |
850 |
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" |
851 |
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ |
852 |
-"(initramfs/initrd) support" |
853 |
- |
854 |
- local opt desc |
855 |
- |
856 |
- # Generate ERROR_* variables for check_extra_config. |
857 |
- for opt in ${CONFIG_CHECK}; do |
858 |
- opt=${opt#\~} |
859 |
- desc=desc_${opt} |
860 |
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ |
861 |
- "is missing and REQUIRED'" |
862 |
- done |
863 |
- |
864 |
- check_extra_config |
865 |
- echo |
866 |
- else |
867 |
- ewarn "" |
868 |
- ewarn "Your kernel configuration couldn't be checked. Do you have" |
869 |
- ewarn "/usr/src/linux/.config file there? Please check manually if" |
870 |
- ewarn "following options are enabled:" |
871 |
- ewarn "" |
872 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
873 |
- ewarn " CONFIG_DEVTMPFS" |
874 |
- ewarn "" |
875 |
- fi |
876 |
- |
877 |
- elog "To get additional features, a number of optional runtime" |
878 |
- elog "dependencies may be installed:" |
879 |
- elog "" |
880 |
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
881 |
- sys-apps/iproute2 "net-misc/iputils[arping]" |
882 |
- optfeature \ |
883 |
- "Measure performance of the boot process for later visualisation" \ |
884 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
885 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
886 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
887 |
- sys-libs/libcap |
888 |
- optfeature "Support CIFS" net-fs/cifs-utils |
889 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
890 |
- "sys-fs/cryptsetup[-static-libs]" |
891 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
892 |
- app-crypt/gnupg |
893 |
- optfeature \ |
894 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
895 |
- app-shells/dash |
896 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
897 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
898 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
899 |
- sys-fs/mdadm |
900 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
901 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
902 |
- optfeature "Support network block devices" sys-block/nbd |
903 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
904 |
- optfeature \ |
905 |
- "Install ssh and scp along with config files and specified keys" \ |
906 |
- net-misc/openssh |
907 |
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
908 |
- app-admin/rsyslog |
909 |
-} |
910 |
|
911 |
diff --git a/sys-kernel/dracut/dracut-047-r1.ebuild b/sys-kernel/dracut/dracut-047-r1.ebuild |
912 |
deleted file mode 100644 |
913 |
index ffbb944a4c1..00000000000 |
914 |
--- a/sys-kernel/dracut/dracut-047-r1.ebuild |
915 |
+++ /dev/null |
916 |
@@ -1,154 +0,0 @@ |
917 |
-# Copyright 1999-2018 Gentoo Authors |
918 |
-# Distributed under the terms of the GNU General Public License v2 |
919 |
- |
920 |
-EAPI=6 |
921 |
- |
922 |
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs |
923 |
- |
924 |
-DESCRIPTION="Generic initramfs generation tool" |
925 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
926 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" |
927 |
- |
928 |
-LICENSE="GPL-2" |
929 |
-SLOT="0" |
930 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
931 |
-IUSE="debug selinux" |
932 |
- |
933 |
-# Tests need root privileges, bug #298014 |
934 |
-RESTRICT="test" |
935 |
- |
936 |
-COMMON_DEPEND=">=sys-apps/kmod-23[tools] |
937 |
- virtual/pkgconfig |
938 |
- virtual/udev |
939 |
- " |
940 |
-RDEPEND="${COMMON_DEPEND} |
941 |
- app-arch/cpio |
942 |
- >=app-shells/bash-4.0:0 |
943 |
- sys-apps/coreutils[xattr(-)] |
944 |
- || ( |
945 |
- >=sys-apps/sysvinit-2.87-r3 |
946 |
- sys-apps/systemd[sysv-utils] |
947 |
- ) |
948 |
- >=sys-apps/util-linux-2.21 |
949 |
- |
950 |
- debug? ( dev-util/strace ) |
951 |
- selinux? ( |
952 |
- sec-policy/selinux-dracut |
953 |
- sys-libs/libselinux |
954 |
- sys-libs/libsepol |
955 |
- ) |
956 |
- " |
957 |
-DEPEND="${COMMON_DEPEND} |
958 |
- app-text/asciidoc |
959 |
- app-text/docbook-xml-dtd:4.5 |
960 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
961 |
- >=dev-libs/libxslt-1.1.26 |
962 |
- " |
963 |
- |
964 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
965 |
- README.testsuite TODO ) |
966 |
- |
967 |
-QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
968 |
- |
969 |
-PATCHES=( |
970 |
- "${FILESDIR}/045-systemdutildir.patch" |
971 |
- "${FILESDIR}/047-all-fix-issues-found-by-shellcheck.patch" |
972 |
- "${FILESDIR}/047-plymouth-fix-detection-of-plymouth-directory.patch" |
973 |
-) |
974 |
- |
975 |
-src_configure() { |
976 |
- local myconf=( |
977 |
- --prefix="${EPREFIX}/usr" |
978 |
- --sysconfdir="${EPREFIX}/etc" |
979 |
- --bashcompletiondir="$(get_bashcompdir)" |
980 |
- --systemdsystemunitdir="$(systemd_get_systemunitdir)" |
981 |
- ) |
982 |
- |
983 |
- tc-export CC PKG_CONFIG |
984 |
- |
985 |
- echo ./configure "${myconf[@]}" |
986 |
- ./configure "${myconf[@]}" || die |
987 |
-} |
988 |
- |
989 |
-src_install() { |
990 |
- default |
991 |
- |
992 |
- local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) |
993 |
- if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then |
994 |
- # Preserve lib -> lib64 symlinks in initramfs |
995 |
- libdirs+=( /lib /usr/lib ) |
996 |
- fi |
997 |
- |
998 |
- einfo "Setting libdirs to \"${libdirs[*]}\" ..." |
999 |
- echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die |
1000 |
- insinto "/usr/lib/dracut/dracut.conf.d" |
1001 |
- doins "${T}/gentoo.conf" |
1002 |
- |
1003 |
- insinto /etc/logrotate.d |
1004 |
- newins dracut.logrotate dracut |
1005 |
- |
1006 |
- docinto html |
1007 |
- dodoc dracut.html |
1008 |
-} |
1009 |
- |
1010 |
-pkg_postinst() { |
1011 |
- if linux-info_get_any_version && linux_config_exists; then |
1012 |
- ewarn "" |
1013 |
- ewarn "If the following test report contains a missing kernel" |
1014 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
1015 |
- ewarn "kernel before booting image generated with this Dracut version." |
1016 |
- ewarn "" |
1017 |
- |
1018 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
1019 |
- |
1020 |
- # Kernel configuration options descriptions: |
1021 |
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' |
1022 |
- ERROR_DEVTMPFS+='is missing and REQUIRED' |
1023 |
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' |
1024 |
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' |
1025 |
- |
1026 |
- check_extra_config |
1027 |
- echo |
1028 |
- else |
1029 |
- ewarn "" |
1030 |
- ewarn "Your kernel configuration couldn't be checked." |
1031 |
- ewarn "Please check manually if following options are enabled:" |
1032 |
- ewarn "" |
1033 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
1034 |
- ewarn " CONFIG_DEVTMPFS" |
1035 |
- ewarn "" |
1036 |
- fi |
1037 |
- |
1038 |
- elog "To get additional features, a number of optional runtime" |
1039 |
- elog "dependencies may be installed:" |
1040 |
- elog "" |
1041 |
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
1042 |
- sys-apps/iproute2 "net-misc/iputils[arping]" |
1043 |
- optfeature \ |
1044 |
- "Measure performance of the boot process for later visualisation" \ |
1045 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
1046 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
1047 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
1048 |
- sys-libs/libcap |
1049 |
- optfeature "Support CIFS" net-fs/cifs-utils |
1050 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
1051 |
- "sys-fs/cryptsetup[-static-libs]" |
1052 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
1053 |
- app-crypt/gnupg |
1054 |
- optfeature \ |
1055 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
1056 |
- app-shells/dash |
1057 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
1058 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
1059 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
1060 |
- sys-fs/mdadm |
1061 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
1062 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
1063 |
- optfeature "Support network block devices" sys-block/nbd |
1064 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
1065 |
- optfeature \ |
1066 |
- "Install ssh and scp along with config files and specified keys" \ |
1067 |
- net-misc/openssh |
1068 |
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
1069 |
- app-admin/rsyslog |
1070 |
-} |
1071 |
|
1072 |
diff --git a/sys-kernel/dracut/dracut-048.ebuild b/sys-kernel/dracut/dracut-048.ebuild |
1073 |
deleted file mode 100644 |
1074 |
index 85f233b9f58..00000000000 |
1075 |
--- a/sys-kernel/dracut/dracut-048.ebuild |
1076 |
+++ /dev/null |
1077 |
@@ -1,148 +0,0 @@ |
1078 |
-# Copyright 1999-2018 Gentoo Authors |
1079 |
-# Distributed under the terms of the GNU General Public License v2 |
1080 |
- |
1081 |
-EAPI=6 |
1082 |
- |
1083 |
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs |
1084 |
- |
1085 |
-DESCRIPTION="Generic initramfs generation tool" |
1086 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
1087 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" |
1088 |
- |
1089 |
-LICENSE="GPL-2" |
1090 |
-SLOT="0" |
1091 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
1092 |
-IUSE="debug selinux" |
1093 |
- |
1094 |
-# Tests need root privileges, bug #298014 |
1095 |
-RESTRICT="test" |
1096 |
- |
1097 |
-COMMON_DEPEND=">=sys-apps/kmod-23[tools] |
1098 |
- virtual/pkgconfig |
1099 |
- virtual/udev |
1100 |
- " |
1101 |
-RDEPEND="${COMMON_DEPEND} |
1102 |
- app-arch/cpio |
1103 |
- >=app-shells/bash-4.0:0 |
1104 |
- sys-apps/coreutils[xattr(-)] |
1105 |
- || ( |
1106 |
- >=sys-apps/sysvinit-2.87-r3 |
1107 |
- sys-apps/systemd[sysv-utils] |
1108 |
- ) |
1109 |
- >=sys-apps/util-linux-2.21 |
1110 |
- |
1111 |
- debug? ( dev-util/strace ) |
1112 |
- selinux? ( |
1113 |
- sec-policy/selinux-dracut |
1114 |
- sys-libs/libselinux |
1115 |
- sys-libs/libsepol |
1116 |
- ) |
1117 |
- " |
1118 |
-DEPEND="${COMMON_DEPEND} |
1119 |
- app-text/asciidoc |
1120 |
- app-text/docbook-xml-dtd:4.5 |
1121 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
1122 |
- >=dev-libs/libxslt-1.1.26 |
1123 |
- " |
1124 |
- |
1125 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
1126 |
- README.testsuite TODO ) |
1127 |
- |
1128 |
-QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
1129 |
- |
1130 |
-src_configure() { |
1131 |
- local myconf=( |
1132 |
- --prefix="${EPREFIX}/usr" |
1133 |
- --sysconfdir="${EPREFIX}/etc" |
1134 |
- --bashcompletiondir="$(get_bashcompdir)" |
1135 |
- --systemdsystemunitdir="$(systemd_get_systemunitdir)" |
1136 |
- ) |
1137 |
- |
1138 |
- tc-export CC PKG_CONFIG |
1139 |
- |
1140 |
- echo ./configure "${myconf[@]}" |
1141 |
- ./configure "${myconf[@]}" || die |
1142 |
-} |
1143 |
- |
1144 |
-src_install() { |
1145 |
- default |
1146 |
- |
1147 |
- local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) |
1148 |
- if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then |
1149 |
- # Preserve lib -> lib64 symlinks in initramfs |
1150 |
- libdirs+=( /lib /usr/lib ) |
1151 |
- fi |
1152 |
- |
1153 |
- einfo "Setting libdirs to \"${libdirs[*]}\" ..." |
1154 |
- echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die |
1155 |
- insinto "/usr/lib/dracut/dracut.conf.d" |
1156 |
- doins "${T}/gentoo.conf" |
1157 |
- |
1158 |
- insinto /etc/logrotate.d |
1159 |
- newins dracut.logrotate dracut |
1160 |
- |
1161 |
- docinto html |
1162 |
- dodoc dracut.html |
1163 |
-} |
1164 |
- |
1165 |
-pkg_postinst() { |
1166 |
- if linux-info_get_any_version && linux_config_exists; then |
1167 |
- ewarn "" |
1168 |
- ewarn "If the following test report contains a missing kernel" |
1169 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
1170 |
- ewarn "kernel before booting image generated with this Dracut version." |
1171 |
- ewarn "" |
1172 |
- |
1173 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
1174 |
- |
1175 |
- # Kernel configuration options descriptions: |
1176 |
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' |
1177 |
- ERROR_DEVTMPFS+='is missing and REQUIRED' |
1178 |
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' |
1179 |
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' |
1180 |
- |
1181 |
- check_extra_config |
1182 |
- echo |
1183 |
- else |
1184 |
- ewarn "" |
1185 |
- ewarn "Your kernel configuration couldn't be checked." |
1186 |
- ewarn "Please check manually if following options are enabled:" |
1187 |
- ewarn "" |
1188 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
1189 |
- ewarn " CONFIG_DEVTMPFS" |
1190 |
- ewarn "" |
1191 |
- fi |
1192 |
- |
1193 |
- elog "To get additional features, a number of optional runtime" |
1194 |
- elog "dependencies may be installed:" |
1195 |
- elog "" |
1196 |
- optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
1197 |
- sys-apps/iproute2 "net-misc/iputils[arping]" |
1198 |
- optfeature \ |
1199 |
- "Measure performance of the boot process for later visualisation" \ |
1200 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
1201 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
1202 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
1203 |
- sys-libs/libcap |
1204 |
- optfeature "Support CIFS" net-fs/cifs-utils |
1205 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
1206 |
- "sys-fs/cryptsetup[-static-libs]" |
1207 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
1208 |
- app-crypt/gnupg |
1209 |
- optfeature \ |
1210 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
1211 |
- app-shells/dash |
1212 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
1213 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
1214 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
1215 |
- sys-fs/mdadm |
1216 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
1217 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
1218 |
- optfeature "Support network block devices" sys-block/nbd |
1219 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
1220 |
- optfeature \ |
1221 |
- "Install ssh and scp along with config files and specified keys" \ |
1222 |
- net-misc/openssh |
1223 |
- optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
1224 |
- app-admin/rsyslog |
1225 |
-} |
1226 |
|
1227 |
diff --git a/sys-kernel/dracut/dracut-049-r1.ebuild b/sys-kernel/dracut/dracut-049-r1.ebuild |
1228 |
deleted file mode 100644 |
1229 |
index 05dd8d5ad43..00000000000 |
1230 |
--- a/sys-kernel/dracut/dracut-049-r1.ebuild |
1231 |
+++ /dev/null |
1232 |
@@ -1,156 +0,0 @@ |
1233 |
-# Copyright 1999-2019 Gentoo Authors |
1234 |
-# Distributed under the terms of the GNU General Public License v2 |
1235 |
- |
1236 |
-EAPI=7 |
1237 |
- |
1238 |
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs |
1239 |
- |
1240 |
-if [[ ${PV} == 9999 ]] ; then |
1241 |
- inherit git-r3 |
1242 |
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut" |
1243 |
-else |
1244 |
- [[ "${PV}" = *_rc* ]] || \ |
1245 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
1246 |
- SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz" |
1247 |
-fi |
1248 |
- |
1249 |
-DESCRIPTION="Generic initramfs generation tool" |
1250 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
1251 |
- |
1252 |
-LICENSE="GPL-2" |
1253 |
-SLOT="0" |
1254 |
-IUSE="selinux" |
1255 |
- |
1256 |
-# Tests need root privileges, bug #298014 |
1257 |
-RESTRICT="test" |
1258 |
- |
1259 |
-RDEPEND=" |
1260 |
- app-arch/cpio |
1261 |
- >=app-shells/bash-4.0:0 |
1262 |
- sys-apps/coreutils[xattr(-)] |
1263 |
- >=sys-apps/kmod-23[tools] |
1264 |
- || ( |
1265 |
- >=sys-apps/sysvinit-2.87-r3 |
1266 |
- sys-apps/systemd[sysv-utils] |
1267 |
- ) |
1268 |
- >=sys-apps/util-linux-2.21 |
1269 |
- virtual/pkgconfig |
1270 |
- virtual/udev |
1271 |
- |
1272 |
- selinux? ( |
1273 |
- sec-policy/selinux-dracut |
1274 |
- sys-libs/libselinux |
1275 |
- sys-libs/libsepol |
1276 |
- ) |
1277 |
- " |
1278 |
-DEPEND=">=sys-apps/kmod-23" |
1279 |
- |
1280 |
-BDEPEND=" |
1281 |
- app-text/asciidoc |
1282 |
- app-text/docbook-xml-dtd:4.5 |
1283 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
1284 |
- >=dev-libs/libxslt-1.1.26 |
1285 |
- virtual/pkgconfig |
1286 |
- " |
1287 |
- |
1288 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
1289 |
- README.testsuite TODO ) |
1290 |
- |
1291 |
-QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
1292 |
- |
1293 |
-PATCHES=( |
1294 |
- "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch |
1295 |
- "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch |
1296 |
- "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch |
1297 |
-) |
1298 |
- |
1299 |
-src_configure() { |
1300 |
- local myconf=( |
1301 |
- --prefix="${EPREFIX}/usr" |
1302 |
- --sysconfdir="${EPREFIX}/etc" |
1303 |
- --bashcompletiondir="$(get_bashcompdir)" |
1304 |
- --systemdsystemunitdir="$(systemd_get_systemunitdir)" |
1305 |
- ) |
1306 |
- |
1307 |
- tc-export CC PKG_CONFIG |
1308 |
- |
1309 |
- echo ./configure "${myconf[@]}" |
1310 |
- ./configure "${myconf[@]}" || die |
1311 |
- |
1312 |
- if [[ ${PV} != 9999 ]] ; then |
1313 |
- # Source tarball from github doesn't include this file |
1314 |
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die |
1315 |
- fi |
1316 |
-} |
1317 |
- |
1318 |
-src_install() { |
1319 |
- default |
1320 |
- |
1321 |
- insinto /etc/logrotate.d |
1322 |
- newins dracut.logrotate dracut |
1323 |
- |
1324 |
- docinto html |
1325 |
- dodoc dracut.html |
1326 |
-} |
1327 |
- |
1328 |
-pkg_postinst() { |
1329 |
- if linux-info_get_any_version && linux_config_exists; then |
1330 |
- ewarn "" |
1331 |
- ewarn "If the following test report contains a missing kernel" |
1332 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
1333 |
- ewarn "kernel before booting image generated with this Dracut version." |
1334 |
- ewarn "" |
1335 |
- |
1336 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
1337 |
- |
1338 |
- # Kernel configuration options descriptions: |
1339 |
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' |
1340 |
- ERROR_DEVTMPFS+='is missing and REQUIRED' |
1341 |
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' |
1342 |
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' |
1343 |
- |
1344 |
- check_extra_config |
1345 |
- echo |
1346 |
- else |
1347 |
- ewarn "" |
1348 |
- ewarn "Your kernel configuration couldn't be checked." |
1349 |
- ewarn "Please check manually if following options are enabled:" |
1350 |
- ewarn "" |
1351 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
1352 |
- ewarn " CONFIG_DEVTMPFS" |
1353 |
- ewarn "" |
1354 |
- fi |
1355 |
- |
1356 |
- elog "To get additional features, a number of optional runtime" |
1357 |
- elog "dependencies may be installed:" |
1358 |
- elog "" |
1359 |
- optfeature "Networking support" net-misc/networkmanager |
1360 |
- optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ |
1361 |
- sys-apps/iproute2 "net-misc/iputils[arping]" |
1362 |
- optfeature \ |
1363 |
- "Measure performance of the boot process for later visualisation" \ |
1364 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
1365 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
1366 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
1367 |
- sys-libs/libcap |
1368 |
- optfeature "Support CIFS" net-fs/cifs-utils |
1369 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
1370 |
- "sys-fs/cryptsetup[-static-libs]" |
1371 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
1372 |
- app-crypt/gnupg |
1373 |
- optfeature \ |
1374 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
1375 |
- app-shells/dash |
1376 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
1377 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
1378 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
1379 |
- sys-fs/mdadm |
1380 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
1381 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
1382 |
- optfeature "Support network block devices" sys-block/nbd |
1383 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
1384 |
- optfeature \ |
1385 |
- "Install ssh and scp along with config files and specified keys" \ |
1386 |
- net-misc/openssh |
1387 |
- optfeature "Enable logging with rsyslog" app-admin/rsyslog |
1388 |
-} |
1389 |
|
1390 |
diff --git a/sys-kernel/dracut/dracut-049-r2.ebuild b/sys-kernel/dracut/dracut-049-r2.ebuild |
1391 |
deleted file mode 100644 |
1392 |
index 872f2ff3a24..00000000000 |
1393 |
--- a/sys-kernel/dracut/dracut-049-r2.ebuild |
1394 |
+++ /dev/null |
1395 |
@@ -1,157 +0,0 @@ |
1396 |
-# Copyright 1999-2019 Gentoo Authors |
1397 |
-# Distributed under the terms of the GNU General Public License v2 |
1398 |
- |
1399 |
-EAPI=7 |
1400 |
- |
1401 |
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs |
1402 |
- |
1403 |
-if [[ ${PV} == 9999 ]] ; then |
1404 |
- inherit git-r3 |
1405 |
- EGIT_REPO_URI="https://github.com/dracutdevs/dracut" |
1406 |
-else |
1407 |
- [[ "${PV}" = *_rc* ]] || \ |
1408 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
1409 |
- SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz" |
1410 |
-fi |
1411 |
- |
1412 |
-DESCRIPTION="Generic initramfs generation tool" |
1413 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
1414 |
- |
1415 |
-LICENSE="GPL-2" |
1416 |
-SLOT="0" |
1417 |
-IUSE="selinux" |
1418 |
- |
1419 |
-# Tests need root privileges, bug #298014 |
1420 |
-RESTRICT="test" |
1421 |
- |
1422 |
-RDEPEND=" |
1423 |
- app-arch/cpio |
1424 |
- >=app-shells/bash-4.0:0 |
1425 |
- sys-apps/coreutils[xattr(-)] |
1426 |
- >=sys-apps/kmod-23[tools] |
1427 |
- || ( |
1428 |
- >=sys-apps/sysvinit-2.87-r3 |
1429 |
- sys-apps/openrc[sysv-utils,selinux?] |
1430 |
- sys-apps/systemd[sysv-utils] |
1431 |
- ) |
1432 |
- >=sys-apps/util-linux-2.21 |
1433 |
- virtual/pkgconfig |
1434 |
- virtual/udev |
1435 |
- |
1436 |
- selinux? ( |
1437 |
- sec-policy/selinux-dracut |
1438 |
- sys-libs/libselinux |
1439 |
- sys-libs/libsepol |
1440 |
- ) |
1441 |
- " |
1442 |
-DEPEND=">=sys-apps/kmod-23" |
1443 |
- |
1444 |
-BDEPEND=" |
1445 |
- app-text/asciidoc |
1446 |
- app-text/docbook-xml-dtd:4.5 |
1447 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
1448 |
- >=dev-libs/libxslt-1.1.26 |
1449 |
- virtual/pkgconfig |
1450 |
- " |
1451 |
- |
1452 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
1453 |
- README.testsuite TODO ) |
1454 |
- |
1455 |
-QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
1456 |
- |
1457 |
-PATCHES=( |
1458 |
- "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch |
1459 |
- "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch |
1460 |
- "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch |
1461 |
-) |
1462 |
- |
1463 |
-src_configure() { |
1464 |
- local myconf=( |
1465 |
- --prefix="${EPREFIX}/usr" |
1466 |
- --sysconfdir="${EPREFIX}/etc" |
1467 |
- --bashcompletiondir="$(get_bashcompdir)" |
1468 |
- --systemdsystemunitdir="$(systemd_get_systemunitdir)" |
1469 |
- ) |
1470 |
- |
1471 |
- tc-export CC PKG_CONFIG |
1472 |
- |
1473 |
- echo ./configure "${myconf[@]}" |
1474 |
- ./configure "${myconf[@]}" || die |
1475 |
- |
1476 |
- if [[ ${PV} != 9999 ]] ; then |
1477 |
- # Source tarball from github doesn't include this file |
1478 |
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die |
1479 |
- fi |
1480 |
-} |
1481 |
- |
1482 |
-src_install() { |
1483 |
- default |
1484 |
- |
1485 |
- insinto /etc/logrotate.d |
1486 |
- newins dracut.logrotate dracut |
1487 |
- |
1488 |
- docinto html |
1489 |
- dodoc dracut.html |
1490 |
-} |
1491 |
- |
1492 |
-pkg_postinst() { |
1493 |
- if linux-info_get_any_version && linux_config_exists; then |
1494 |
- ewarn "" |
1495 |
- ewarn "If the following test report contains a missing kernel" |
1496 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
1497 |
- ewarn "kernel before booting image generated with this Dracut version." |
1498 |
- ewarn "" |
1499 |
- |
1500 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
1501 |
- |
1502 |
- # Kernel configuration options descriptions: |
1503 |
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' |
1504 |
- ERROR_DEVTMPFS+='is missing and REQUIRED' |
1505 |
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' |
1506 |
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' |
1507 |
- |
1508 |
- check_extra_config |
1509 |
- echo |
1510 |
- else |
1511 |
- ewarn "" |
1512 |
- ewarn "Your kernel configuration couldn't be checked." |
1513 |
- ewarn "Please check manually if following options are enabled:" |
1514 |
- ewarn "" |
1515 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
1516 |
- ewarn " CONFIG_DEVTMPFS" |
1517 |
- ewarn "" |
1518 |
- fi |
1519 |
- |
1520 |
- elog "To get additional features, a number of optional runtime" |
1521 |
- elog "dependencies may be installed:" |
1522 |
- elog "" |
1523 |
- optfeature "Networking support" net-misc/networkmanager |
1524 |
- optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ |
1525 |
- sys-apps/iproute2 "net-misc/iputils[arping]" |
1526 |
- optfeature \ |
1527 |
- "Measure performance of the boot process for later visualisation" \ |
1528 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
1529 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
1530 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
1531 |
- sys-libs/libcap |
1532 |
- optfeature "Support CIFS" net-fs/cifs-utils |
1533 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
1534 |
- "sys-fs/cryptsetup[-static-libs]" |
1535 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
1536 |
- app-crypt/gnupg |
1537 |
- optfeature \ |
1538 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
1539 |
- app-shells/dash |
1540 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
1541 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
1542 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
1543 |
- sys-fs/mdadm |
1544 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
1545 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
1546 |
- optfeature "Support network block devices" sys-block/nbd |
1547 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
1548 |
- optfeature \ |
1549 |
- "Install ssh and scp along with config files and specified keys" \ |
1550 |
- net-misc/openssh |
1551 |
- optfeature "Enable logging with rsyslog" app-admin/rsyslog |
1552 |
-} |
1553 |
|
1554 |
diff --git a/sys-kernel/dracut/dracut-049.ebuild b/sys-kernel/dracut/dracut-049.ebuild |
1555 |
deleted file mode 100644 |
1556 |
index dda60561bf7..00000000000 |
1557 |
--- a/sys-kernel/dracut/dracut-049.ebuild |
1558 |
+++ /dev/null |
1559 |
@@ -1,158 +0,0 @@ |
1560 |
-# Copyright 1999-2019 Gentoo Authors |
1561 |
-# Distributed under the terms of the GNU General Public License v2 |
1562 |
- |
1563 |
-EAPI=7 |
1564 |
- |
1565 |
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs |
1566 |
- |
1567 |
-DESCRIPTION="Generic initramfs generation tool" |
1568 |
-HOMEPAGE="https://dracut.wiki.kernel.org" |
1569 |
-SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz" |
1570 |
- |
1571 |
-LICENSE="GPL-2" |
1572 |
-SLOT="0" |
1573 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
1574 |
-IUSE="selinux" |
1575 |
- |
1576 |
-# Tests need root privileges, bug #298014 |
1577 |
-RESTRICT="test" |
1578 |
- |
1579 |
-RDEPEND=" |
1580 |
- app-arch/cpio |
1581 |
- >=app-shells/bash-4.0:0 |
1582 |
- sys-apps/coreutils[xattr(-)] |
1583 |
- >=sys-apps/kmod-23[tools] |
1584 |
- || ( |
1585 |
- >=sys-apps/sysvinit-2.87-r3 |
1586 |
- sys-apps/systemd[sysv-utils] |
1587 |
- ) |
1588 |
- >=sys-apps/util-linux-2.21 |
1589 |
- virtual/pkgconfig |
1590 |
- virtual/udev |
1591 |
- |
1592 |
- selinux? ( |
1593 |
- sec-policy/selinux-dracut |
1594 |
- sys-libs/libselinux |
1595 |
- sys-libs/libsepol |
1596 |
- ) |
1597 |
- " |
1598 |
-DEPEND=">=sys-apps/kmod-23" |
1599 |
- |
1600 |
-BDEPEND=" |
1601 |
- app-text/asciidoc |
1602 |
- app-text/docbook-xml-dtd:4.5 |
1603 |
- >=app-text/docbook-xsl-stylesheets-1.75.2 |
1604 |
- >=dev-libs/libxslt-1.1.26 |
1605 |
- virtual/pkgconfig |
1606 |
- " |
1607 |
- |
1608 |
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
1609 |
- README.testsuite TODO ) |
1610 |
- |
1611 |
-QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
1612 |
- |
1613 |
-PATCHES=( |
1614 |
- "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch |
1615 |
- "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch |
1616 |
- "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch |
1617 |
-) |
1618 |
- |
1619 |
-src_configure() { |
1620 |
- local myconf=( |
1621 |
- --prefix="${EPREFIX}/usr" |
1622 |
- --sysconfdir="${EPREFIX}/etc" |
1623 |
- --bashcompletiondir="$(get_bashcompdir)" |
1624 |
- --systemdsystemunitdir="$(systemd_get_systemunitdir)" |
1625 |
- ) |
1626 |
- |
1627 |
- tc-export CC PKG_CONFIG |
1628 |
- |
1629 |
- echo ./configure "${myconf[@]}" |
1630 |
- ./configure "${myconf[@]}" || die |
1631 |
- |
1632 |
- # Source tarball from github doesn't include this file |
1633 |
- echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die |
1634 |
-} |
1635 |
- |
1636 |
-src_install() { |
1637 |
- default |
1638 |
- |
1639 |
- local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) |
1640 |
- if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then |
1641 |
- # Preserve lib -> lib64 symlinks in initramfs |
1642 |
- libdirs+=( /lib /usr/lib ) |
1643 |
- fi |
1644 |
- |
1645 |
- einfo "Setting libdirs to \"${libdirs[*]}\" ..." |
1646 |
- echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die |
1647 |
- insinto "/usr/lib/dracut/dracut.conf.d" |
1648 |
- doins "${T}/gentoo.conf" |
1649 |
- |
1650 |
- insinto /etc/logrotate.d |
1651 |
- newins dracut.logrotate dracut |
1652 |
- |
1653 |
- docinto html |
1654 |
- dodoc dracut.html |
1655 |
-} |
1656 |
- |
1657 |
-pkg_postinst() { |
1658 |
- if linux-info_get_any_version && linux_config_exists; then |
1659 |
- ewarn "" |
1660 |
- ewarn "If the following test report contains a missing kernel" |
1661 |
- ewarn "configuration option, you should reconfigure and rebuild your" |
1662 |
- ewarn "kernel before booting image generated with this Dracut version." |
1663 |
- ewarn "" |
1664 |
- |
1665 |
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
1666 |
- |
1667 |
- # Kernel configuration options descriptions: |
1668 |
- local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' |
1669 |
- ERROR_DEVTMPFS+='is missing and REQUIRED' |
1670 |
- local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' |
1671 |
- ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' |
1672 |
- |
1673 |
- check_extra_config |
1674 |
- echo |
1675 |
- else |
1676 |
- ewarn "" |
1677 |
- ewarn "Your kernel configuration couldn't be checked." |
1678 |
- ewarn "Please check manually if following options are enabled:" |
1679 |
- ewarn "" |
1680 |
- ewarn " CONFIG_BLK_DEV_INITRD" |
1681 |
- ewarn " CONFIG_DEVTMPFS" |
1682 |
- ewarn "" |
1683 |
- fi |
1684 |
- |
1685 |
- elog "To get additional features, a number of optional runtime" |
1686 |
- elog "dependencies may be installed:" |
1687 |
- elog "" |
1688 |
- optfeature "Networking support" net-misc/networkmanager |
1689 |
- optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ |
1690 |
- sys-apps/iproute2 "net-misc/iputils[arping]" |
1691 |
- optfeature \ |
1692 |
- "Measure performance of the boot process for later visualisation" \ |
1693 |
- app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
1694 |
- optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
1695 |
- optfeature "Load kernel modules and drop this privilege for real init" \ |
1696 |
- sys-libs/libcap |
1697 |
- optfeature "Support CIFS" net-fs/cifs-utils |
1698 |
- optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
1699 |
- "sys-fs/cryptsetup[-static-libs]" |
1700 |
- optfeature "Support for GPG-encrypted keys for crypt module" \ |
1701 |
- app-crypt/gnupg |
1702 |
- optfeature \ |
1703 |
- "Allows use of dash instead of default bash (on your own risk)" \ |
1704 |
- app-shells/dash |
1705 |
- optfeature "Support iSCSI" sys-block/open-iscsi |
1706 |
- optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
1707 |
- optfeature "Support MD devices, also known as software RAID devices" \ |
1708 |
- sys-fs/mdadm |
1709 |
- optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
1710 |
- optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
1711 |
- optfeature "Support network block devices" sys-block/nbd |
1712 |
- optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
1713 |
- optfeature \ |
1714 |
- "Install ssh and scp along with config files and specified keys" \ |
1715 |
- net-misc/openssh |
1716 |
- optfeature "Enable logging with rsyslog" app-admin/rsyslog |
1717 |
-} |
1718 |
|
1719 |
diff --git a/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch b/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch |
1720 |
deleted file mode 100644 |
1721 |
index fd6f1185945..00000000000 |
1722 |
--- a/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch |
1723 |
+++ /dev/null |
1724 |
@@ -1,32 +0,0 @@ |
1725 |
-From c41df7e1db1adc51399ab2c22f251b15eb2065b1 Mon Sep 17 00:00:00 2001 |
1726 |
-From: Alexander Tsoy <alexander@××××.me> |
1727 |
-Date: Tue, 5 Jan 2016 22:11:57 +0300 |
1728 |
-Subject: [PATCH] base/dracut-lib.sh:dev_unit_name() guard against $dev |
1729 |
- beginning with "-" |
1730 |
- |
1731 |
-crypt/parse-crypt.sh generate initqueue job which always call |
1732 |
-dev_unit_name() with an argument beginning with "-". This results |
1733 |
-in the following error: |
1734 |
- |
1735 |
-dracut-initqueue[307]: + systemd-escape -p -cfb4aa43-2f02-4c6b-a313-60ea99288087 |
1736 |
-dracut-initqueue[307]: systemd-escape: invalid option -- 'c' |
1737 |
---- |
1738 |
- modules.d/99base/dracut-lib.sh | 2 +- |
1739 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
1740 |
- |
1741 |
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh |
1742 |
-index ad03394..0a0b1b9 100755 |
1743 |
---- a/modules.d/99base/dracut-lib.sh |
1744 |
-+++ b/modules.d/99base/dracut-lib.sh |
1745 |
-@@ -874,7 +874,7 @@ dev_unit_name() |
1746 |
- local dev="$1" |
1747 |
- |
1748 |
- if command -v systemd-escape >/dev/null; then |
1749 |
-- systemd-escape -p "$dev" |
1750 |
-+ systemd-escape -p -- "$dev" |
1751 |
- return |
1752 |
- fi |
1753 |
- |
1754 |
--- |
1755 |
-2.10.2 |
1756 |
- |
1757 |
|
1758 |
diff --git a/sys-kernel/dracut/files/044-0002-systemd-initrd-add-initrd-root-device.target.patch b/sys-kernel/dracut/files/044-0002-systemd-initrd-add-initrd-root-device.target.patch |
1759 |
deleted file mode 100644 |
1760 |
index 21cb6792acd..00000000000 |
1761 |
--- a/sys-kernel/dracut/files/044-0002-systemd-initrd-add-initrd-root-device.target.patch |
1762 |
+++ /dev/null |
1763 |
@@ -1,24 +0,0 @@ |
1764 |
-From d4efc0aeeecc470d9a267b7f3c130f472488905c Mon Sep 17 00:00:00 2001 |
1765 |
-From: Harald Hoyer <harald@××××××.com> |
1766 |
-Date: Wed, 25 May 2016 15:06:29 +0200 |
1767 |
-Subject: [PATCH] systemd-initrd: add initrd-root-device.target |
1768 |
- |
1769 |
---- |
1770 |
- modules.d/01systemd-initrd/module-setup.sh | 1 + |
1771 |
- 1 file changed, 1 insertion(+) |
1772 |
- |
1773 |
-diff --git a/modules.d/01systemd-initrd/module-setup.sh b/modules.d/01systemd-initrd/module-setup.sh |
1774 |
-index fb6a9ea..c1ccd2a 100755 |
1775 |
---- a/modules.d/01systemd-initrd/module-setup.sh |
1776 |
-+++ b/modules.d/01systemd-initrd/module-setup.sh |
1777 |
-@@ -28,6 +28,7 @@ install() { |
1778 |
- inst_multiple -o \ |
1779 |
- $systemdsystemunitdir/initrd.target \ |
1780 |
- $systemdsystemunitdir/initrd-fs.target \ |
1781 |
-+ $systemdsystemunitdir/initrd-root-device.target \ |
1782 |
- $systemdsystemunitdir/initrd-root-fs.target \ |
1783 |
- $systemdsystemunitdir/initrd-switch-root.target \ |
1784 |
- $systemdsystemunitdir/initrd-switch-root.service \ |
1785 |
--- |
1786 |
-2.10.2 |
1787 |
- |
1788 |
|
1789 |
diff --git a/sys-kernel/dracut/files/044-0003-50-dracut.install-use-bin-bash-shebang.patch b/sys-kernel/dracut/files/044-0003-50-dracut.install-use-bin-bash-shebang.patch |
1790 |
deleted file mode 100644 |
1791 |
index 85ebc7e638f..00000000000 |
1792 |
--- a/sys-kernel/dracut/files/044-0003-50-dracut.install-use-bin-bash-shebang.patch |
1793 |
+++ /dev/null |
1794 |
@@ -1,23 +0,0 @@ |
1795 |
-From 69395a528aed99ec04b16c14ebacf4c2e10afd26 Mon Sep 17 00:00:00 2001 |
1796 |
-From: Mike Gilbert <floppym@g.o> |
1797 |
-Date: Fri, 4 Nov 2016 13:09:28 -0400 |
1798 |
-Subject: [PATCH] 50-dracut.install: use /bin/bash shebang |
1799 |
- |
1800 |
-This script utilizes several bash-specific constructs. |
1801 |
---- |
1802 |
- 50-dracut.install | 2 +- |
1803 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
1804 |
- |
1805 |
-diff --git a/50-dracut.install b/50-dracut.install |
1806 |
-index 7d081d5..54c71d4 100755 |
1807 |
---- a/50-dracut.install |
1808 |
-+++ b/50-dracut.install |
1809 |
-@@ -1,4 +1,4 @@ |
1810 |
--#!/bin/sh |
1811 |
-+#!/bin/bash |
1812 |
- |
1813 |
- COMMAND="$1" |
1814 |
- KERNEL_VERSION="$2" |
1815 |
--- |
1816 |
-2.10.2 |
1817 |
- |
1818 |
|
1819 |
diff --git a/sys-kernel/dracut/files/045-systemdutildir.patch b/sys-kernel/dracut/files/045-systemdutildir.patch |
1820 |
deleted file mode 100644 |
1821 |
index e56abba3547..00000000000 |
1822 |
--- a/sys-kernel/dracut/files/045-systemdutildir.patch |
1823 |
+++ /dev/null |
1824 |
@@ -1,45 +0,0 @@ |
1825 |
-From ed5cc98864c28eab2c4cb45ec0f67450699aaaa8 Mon Sep 17 00:00:00 2001 |
1826 |
-From: Mike Gilbert <floppym@g.o> |
1827 |
-Date: Mon, 3 Jul 2017 22:39:42 -0400 |
1828 |
-Subject: [PATCH] dracut.sh: improve udevdir and systemdutildir fallback logic |
1829 |
- |
1830 |
-Check for a common binary in systemdutildir. This resolves an issue on |
1831 |
-split-usr systems, where it is common to have both /lib/systemd[/system] |
1832 |
-and /usr/lib/systemd[/user] present. |
1833 |
- |
1834 |
-Check for systemd-udevd specifically, since some distros (Gentoo) allow |
1835 |
-udev to be installed without the rest of the systemd stack. |
1836 |
- |
1837 |
-Similar logic is applied to udevdir simply for consistency. |
1838 |
---- |
1839 |
- dracut.sh | 8 ++++---- |
1840 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
1841 |
- |
1842 |
-diff --git a/dracut.sh b/dracut.sh |
1843 |
-index 64d94201..67c12a72 100755 |
1844 |
---- a/dracut.sh |
1845 |
-+++ b/dracut.sh |
1846 |
-@@ -1266,16 +1266,16 @@ done |
1847 |
- [[ -d $udevdir ]] \ |
1848 |
- || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)" |
1849 |
- if ! [[ -d "$udevdir" ]]; then |
1850 |
-- [[ ! -h /lib ]] && [[ -d /lib/udev ]] && udevdir=/lib/udev |
1851 |
-- [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev |
1852 |
-+ [[ -e /lib/udev/collect ]] && udevdir=/lib/udev |
1853 |
-+ [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev |
1854 |
- fi |
1855 |
- |
1856 |
- [[ -d $systemdutildir ]] \ |
1857 |
- || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null) |
1858 |
- |
1859 |
- if ! [[ -d "$systemdutildir" ]]; then |
1860 |
-- [[ ! -h /lib ]] && [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd |
1861 |
-- [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd |
1862 |
-+ [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd |
1863 |
-+ [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd |
1864 |
- fi |
1865 |
- |
1866 |
- [[ -d $systemdsystemunitdir ]] \ |
1867 |
--- |
1868 |
-2.13.2 |
1869 |
- |
1870 |
|
1871 |
diff --git a/sys-kernel/dracut/files/046-amd-microcode.patch b/sys-kernel/dracut/files/046-amd-microcode.patch |
1872 |
deleted file mode 100644 |
1873 |
index c351275dbeb..00000000000 |
1874 |
--- a/sys-kernel/dracut/files/046-amd-microcode.patch |
1875 |
+++ /dev/null |
1876 |
@@ -1,30 +0,0 @@ |
1877 |
-From a1250a704e33c59f2395aaad054db1c745a5c98a Mon Sep 17 00:00:00 2001 |
1878 |
-From: Daniel Molkentin <dmolkentin@××××.com> |
1879 |
-Date: Tue, 12 Dec 2017 17:48:36 +0100 |
1880 |
-Subject: [PATCH] Simplify microcode lookup for for AMD CPUs |
1881 |
- |
1882 |
---- |
1883 |
- dracut-functions.sh | 7 ++----- |
1884 |
- 1 file changed, 2 insertions(+), 5 deletions(-) |
1885 |
- |
1886 |
-diff --git a/dracut-functions.sh b/dracut-functions.sh |
1887 |
-index 112b2434..d7fc5303 100755 |
1888 |
---- a/dracut-functions.sh |
1889 |
-+++ b/dracut-functions.sh |
1890 |
-@@ -661,11 +661,8 @@ get_ucode_file () |
1891 |
- local stepping=`grep -E "stepping" /proc/cpuinfo | head -1 | sed s/.*:\ //` |
1892 |
- |
1893 |
- if [[ "$(get_cpu_vendor)" == "AMD" ]]; then |
1894 |
-- # If family greater than or equal to 0x16 |
1895 |
-- if [[ $family -ge 22 ]]; then |
1896 |
-- printf "microcode_amd_fam16h.bin" |
1897 |
-- elif [[ $family -eq 21 ]]; then |
1898 |
-- printf "microcode_amd_fam15h.bin" |
1899 |
-+ if [[ $family -ge 21 ]]; then |
1900 |
-+ printf "microcode_amd_fam%xh.bin" $family |
1901 |
- else |
1902 |
- printf "microcode_amd.bin" |
1903 |
- fi |
1904 |
--- |
1905 |
-2.16.0.rc0 |
1906 |
- |
1907 |
|
1908 |
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 |
1909 |
deleted file mode 100644 |
1910 |
index d5cbe042b63..00000000000 |
1911 |
--- a/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch |
1912 |
+++ /dev/null |
1913 |
@@ -1,77 +0,0 @@ |
1914 |
-From 3aa37cafde734719f2377600a17459fad30edfbc Mon Sep 17 00:00:00 2001 |
1915 |
-From: Lukas Nykryn <lnykryn@××××××.com> |
1916 |
-Date: Fri, 2 Mar 2018 12:29:46 +0100 |
1917 |
-Subject: [PATCH 06/14] all: fix issues found by shellcheck |
1918 |
-To: <initramfs@×××××××××××.org> |
1919 |
- |
1920 |
-Error: SHELLCHECK_WARNING: |
1921 |
-/usr/lib/dracut/dracut-init.sh:939:20: error: Argument to implicit -n is always true due to literal strings. [SC2157] |
1922 |
- 937| dracut_kernel_post() { |
1923 |
- 938| for _f in modules.builtin.bin modules.builtin modules.order; do |
1924 |
- 939|-> [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" |
1925 |
- 940| done |
1926 |
- 941| |
1927 |
- |
1928 |
-Error: SHELLCHECK_WARNING: |
1929 |
-/usr/lib/dracut/modules.d/98syslog/parse-syslog-opts.sh:18:12: error: This expression is constant. Did you forget a $ somewhere? [SC2078] |
1930 |
- 16| elif [ -e /sbin/syslogd ]; then |
1931 |
- 17| syslogtype="syslogd" |
1932 |
- 18|-> elif [ /sbin/syslog-ng ]; then |
1933 |
- 19| syslogtype="syslog-ng" |
1934 |
- 20| else |
1935 |
- |
1936 |
-Error: SHELLCHECK_WARNING: |
1937 |
-/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] |
1938 |
- 13| strstr "$d" "${luks##luks-}" && return 0 |
1939 |
- 14| if [ -n "$dev" ]; then |
1940 |
- 15|-> for _dev in "$(devnames $d)"; do |
1941 |
- 16| [ "$dev" -ef "$_dev" ] && return 0 |
1942 |
- 17| done |
1943 |
---- |
1944 |
- dracut-init.sh | 2 +- |
1945 |
- modules.d/90crypt/crypt-lib.sh | 2 +- |
1946 |
- modules.d/98syslog/parse-syslog-opts.sh | 2 +- |
1947 |
- 3 files changed, 3 insertions(+), 3 deletions(-) |
1948 |
- |
1949 |
-diff --git a/dracut-init.sh b/dracut-init.sh |
1950 |
-index 53e6f13a..1278c638 100644 |
1951 |
---- a/dracut-init.sh |
1952 |
-+++ b/dracut-init.sh |
1953 |
-@@ -942,7 +942,7 @@ for_each_kmod_dep() { |
1954 |
- |
1955 |
- dracut_kernel_post() { |
1956 |
- for _f in modules.builtin.bin modules.builtin modules.order; do |
1957 |
-- [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" |
1958 |
-+ [[ -e $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" |
1959 |
- done |
1960 |
- |
1961 |
- # generate module dependencies for the initrd |
1962 |
-diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh |
1963 |
-index 532b9a71..bbf485e0 100755 |
1964 |
---- a/modules.d/90crypt/crypt-lib.sh |
1965 |
-+++ b/modules.d/90crypt/crypt-lib.sh |
1966 |
-@@ -12,7 +12,7 @@ crypttab_contains() { |
1967 |
- strstr "${l##luks-}" "${luks##luks-}" && return 0 |
1968 |
- strstr "$d" "${luks##luks-}" && return 0 |
1969 |
- if [ -n "$dev" ]; then |
1970 |
-- for _dev in "$(devnames $d)"; do |
1971 |
-+ for _dev in $(devnames $d); do |
1972 |
- [ "$dev" -ef "$_dev" ] && return 0 |
1973 |
- done |
1974 |
- fi |
1975 |
-diff --git a/modules.d/98syslog/parse-syslog-opts.sh b/modules.d/98syslog/parse-syslog-opts.sh |
1976 |
-index 50ec2759..9ec6ad47 100755 |
1977 |
---- a/modules.d/98syslog/parse-syslog-opts.sh |
1978 |
-+++ b/modules.d/98syslog/parse-syslog-opts.sh |
1979 |
-@@ -15,7 +15,7 @@ detect_syslog() { |
1980 |
- syslogtype="rsyslogd" |
1981 |
- elif [ -e /sbin/syslogd ]; then |
1982 |
- syslogtype="syslogd" |
1983 |
-- elif [ /sbin/syslog-ng ]; then |
1984 |
-+ elif [ -e /sbin/syslog-ng ]; then |
1985 |
- syslogtype="syslog-ng" |
1986 |
- else |
1987 |
- warn "Could not find any syslog binary although the syslogmodule is selected to be installed. Please check." |
1988 |
--- |
1989 |
-2.16.1 |
1990 |
- |
1991 |
|
1992 |
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 |
1993 |
deleted file mode 100644 |
1994 |
index 42f877292a7..00000000000 |
1995 |
--- a/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch |
1996 |
+++ /dev/null |
1997 |
@@ -1,31 +0,0 @@ |
1998 |
-From fe6c7e0f06cde65effb3503a47c31ac39aceefb6 Mon Sep 17 00:00:00 2001 |
1999 |
-From: Alexander Tsoy <alexander@××××.me> |
2000 |
-Date: Fri, 23 Mar 2018 11:52:27 +0300 |
2001 |
-Subject: [PATCH 14/14] plymouth: fix detection of plymouth directory |
2002 |
-To: <initramfs@×××××××××××.org> |
2003 |
- |
2004 |
-Some distros have both /usr/lib/plymouth and /usr/libexec/plymouth |
2005 |
-directorirs, so we should check the existance of plymouth-populate-initrd |
2006 |
-script. |
2007 |
- |
2008 |
-Fixes: 421b46f8ae89cfe2b62e880a8a5079ee8c1b3aae |
2009 |
---- |
2010 |
- modules.d/50plymouth/module-setup.sh | 2 +- |
2011 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
2012 |
- |
2013 |
-diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh |
2014 |
-index 5fbca8b0..b51913e8 100755 |
2015 |
---- a/modules.d/50plymouth/module-setup.sh |
2016 |
-+++ b/modules.d/50plymouth/module-setup.sh |
2017 |
-@@ -6,7 +6,7 @@ pkglib_dir() { |
2018 |
- _dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth" |
2019 |
- fi |
2020 |
- for _dir in $_dirs; do |
2021 |
-- if [ -d $_dir ]; then |
2022 |
-+ if [ -x $_dir/plymouth-populate-initrd ]; then |
2023 |
- echo $_dir |
2024 |
- return |
2025 |
- fi |
2026 |
--- |
2027 |
-2.16.1 |
2028 |
- |
2029 |
|
2030 |
diff --git a/sys-kernel/dracut/files/dracut-044-bash-4.4.patch b/sys-kernel/dracut/files/dracut-044-bash-4.4.patch |
2031 |
deleted file mode 100644 |
2032 |
index 3144c8e6b75..00000000000 |
2033 |
--- a/sys-kernel/dracut/files/dracut-044-bash-4.4.patch |
2034 |
+++ /dev/null |
2035 |
@@ -1,80 +0,0 @@ |
2036 |
-diff -urN dracut-044.orig/modules.d/50drm/module-setup.sh dracut-044/modules.d/50drm/module-setup.sh |
2037 |
---- dracut-044.orig/modules.d/50drm/module-setup.sh 2015-11-25 16:22:28.000000000 +0300 |
2038 |
-+++ dracut-044/modules.d/50drm/module-setup.sh 2016-09-28 02:50:08.914967926 +0300 |
2039 |
-@@ -24,9 +24,9 @@ |
2040 |
- local _fname _fcont |
2041 |
- while read _fname || [ -n "$_fname" ]; do |
2042 |
- case "$_fname" in |
2043 |
-- *.ko) _fcont="$(< $_fname)" ;; |
2044 |
-- *.ko.gz) _fcont="$(gzip -dc $_fname)" ;; |
2045 |
-- *.ko.xz) _fcont="$(xz -dc $_fname)" ;; |
2046 |
-+ *.ko) _fcont="$(< $_fname tr -d \\0)" ;; |
2047 |
-+ *.ko.gz) _fcont="$(gzip -dc $_fname | tr -d \\0)" ;; |
2048 |
-+ *.ko.xz) _fcont="$(xz -dc $_fname | tr -d \\0)" ;; |
2049 |
- esac |
2050 |
- [[ $_fcont =~ $_drm_drivers |
2051 |
- && ! $_fcont =~ iw_handler_get_spy ]] \ |
2052 |
-diff -urN dracut-044.orig/modules.d/90kernel-modules/module-setup.sh dracut-044/modules.d/90kernel-modules/module-setup.sh |
2053 |
---- dracut-044.orig/modules.d/90kernel-modules/module-setup.sh 2015-11-25 16:22:28.000000000 +0300 |
2054 |
-+++ dracut-044/modules.d/90kernel-modules/module-setup.sh 2016-09-28 02:49:11.725390294 +0300 |
2055 |
-@@ -10,9 +10,9 @@ |
2056 |
- function bmf1() { |
2057 |
- local _f |
2058 |
- while read _f || [ -n "$_f" ]; do case "$_f" in |
2059 |
-- *.ko) [[ $(< $_f) =~ $_blockfuncs ]] && echo "$_f" ;; |
2060 |
-- *.ko.gz) [[ $(gzip -dc <$_f) =~ $_blockfuncs ]] && echo "$_f" ;; |
2061 |
-- *.ko.xz) [[ $(xz -dc <$_f) =~ $_blockfuncs ]] && echo "$_f" ;; |
2062 |
-+ *.ko) [[ $(< $_f tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;; |
2063 |
-+ *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;; |
2064 |
-+ *.ko.xz) [[ $(xz -dc <$_f | tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;; |
2065 |
- esac |
2066 |
- done |
2067 |
- return 0 |
2068 |
-diff -urN dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh dracut-044/modules.d/90kernel-network-modules/module-setup.sh |
2069 |
---- dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh 2015-11-25 16:22:28.000000000 +0300 |
2070 |
-+++ dracut-044/modules.d/90kernel-network-modules/module-setup.sh 2016-09-28 02:51:08.202422231 +0300 |
2071 |
-@@ -26,9 +26,9 @@ |
2072 |
- while read _fname; do |
2073 |
- [[ $_fname =~ $_unwanted_drivers ]] && continue |
2074 |
- case "$_fname" in |
2075 |
-- *.ko) _fcont="$(< $_fname)" ;; |
2076 |
-- *.ko.gz) _fcont="$(gzip -dc $_fname)" ;; |
2077 |
-- *.ko.xz) _fcont="$(xz -dc $_fname)" ;; |
2078 |
-+ *.ko) _fcont="$(< $_fname tr -d \\0)" ;; |
2079 |
-+ *.ko.gz) _fcont="$(gzip -dc $_fname | tr -d \\0)" ;; |
2080 |
-+ *.ko.xz) _fcont="$(xz -dc $_fname | tr -d \\0)" ;; |
2081 |
- esac |
2082 |
- [[ $_fcont =~ $_net_drivers |
2083 |
- && ! $_fcont =~ iw_handler_get_spy ]] \ |
2084 |
-diff -urN dracut-044.orig/modules.d/90multipath/module-setup.sh dracut-044/modules.d/90multipath/module-setup.sh |
2085 |
---- dracut-044.orig/modules.d/90multipath/module-setup.sh 2015-11-25 16:22:28.000000000 +0300 |
2086 |
-+++ dracut-044/modules.d/90multipath/module-setup.sh 2016-09-28 02:49:11.726390235 +0300 |
2087 |
-@@ -58,9 +58,9 @@ |
2088 |
- local _f |
2089 |
- while read _f || [ -n "$_f" ]; do |
2090 |
- case "$_f" in |
2091 |
-- *.ko) [[ $(< $_f) =~ $_funcs ]] && echo "$_f" ;; |
2092 |
-- *.ko.gz) [[ $(gzip -dc <$_f) =~ $_funcs ]] && echo "$_f" ;; |
2093 |
-- *.ko.xz) [[ $(xz -dc <$_f) =~ $_funcs ]] && echo "$_f" ;; |
2094 |
-+ *.ko) [[ $(< $_f tr -d \\0) =~ $_funcs ]] && echo "$_f" ;; |
2095 |
-+ *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;; |
2096 |
-+ *.ko.xz) [[ $(xz -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;; |
2097 |
- esac |
2098 |
- done |
2099 |
- return 0 |
2100 |
-diff -urN dracut-044.orig/modules.d/95iscsi/module-setup.sh dracut-044/modules.d/95iscsi/module-setup.sh |
2101 |
---- dracut-044.orig/modules.d/95iscsi/module-setup.sh 2015-11-25 16:22:28.000000000 +0300 |
2102 |
-+++ dracut-044/modules.d/95iscsi/module-setup.sh 2016-09-28 02:49:11.726390235 +0300 |
2103 |
-@@ -168,9 +168,9 @@ |
2104 |
- local _f |
2105 |
- while read _f || [ -n "$_f" ]; do |
2106 |
- case "$_f" in |
2107 |
-- *.ko) [[ $(< $_f) =~ $_funcs ]] && echo "$_f" ;; |
2108 |
-- *.ko.gz) [[ $(gzip -dc <$_f) =~ $_funcs ]] && echo "$_f" ;; |
2109 |
-- *.ko.xz) [[ $(xz -dc <$_f) =~ $_funcs ]] && echo "$_f" ;; |
2110 |
-+ *.ko) [[ $(< $_f tr -d \\0) =~ $_funcs ]] && echo "$_f" ;; |
2111 |
-+ *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;; |
2112 |
-+ *.ko.xz) [[ $(xz -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;; |
2113 |
- esac |
2114 |
- done |
2115 |
- return 0 |
2116 |
|
2117 |
diff --git a/sys-kernel/dracut/files/dracut-044-preserve-xattrs-when-copying.patch b/sys-kernel/dracut/files/dracut-044-preserve-xattrs-when-copying.patch |
2118 |
deleted file mode 100644 |
2119 |
index 3146d8485a9..00000000000 |
2120 |
--- a/sys-kernel/dracut/files/dracut-044-preserve-xattrs-when-copying.patch |
2121 |
+++ /dev/null |
2122 |
@@ -1,51 +0,0 @@ |
2123 |
-From 61c761bc2c35fb244d46fbbde97161f5927071dc Mon Sep 17 00:00:00 2001 |
2124 |
-From: Stefan Berger <stefanb@××××××.com> |
2125 |
-Date: Tue, 25 Oct 2016 15:09:49 -0400 |
2126 |
-Subject: [PATCH] dracut-install: preserve extended attributes when copying |
2127 |
- files |
2128 |
- |
2129 |
-Preserve extended attributes when copying files using dracut-install. |
2130 |
- |
2131 |
-The copying of extended attributes avoids file execution denials when |
2132 |
-the Linux Integrity Measurement's Appraisal mode is active. In that mode |
2133 |
-executables need their file signatures copied. In particular, this patch |
2134 |
-solves the problem that dependent libaries are not included in the |
2135 |
-initramfs since the copied programs could not be executed due to missing |
2136 |
-signatures. The following audit record shows the type of failure that |
2137 |
-is now prevented: |
2138 |
- |
2139 |
-type=INTEGRITY_DATA msg=audit(1477409025.492:30065): pid=922 uid=0 |
2140 |
- auid=4294967295 ses=4294967295 |
2141 |
- subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 |
2142 |
- op="appraise_data" cause="IMA-signature-required" |
2143 |
- comm="ld-linux-x86-64" |
2144 |
- name="/var/tmp/dracut.R6ySa4/initramfs/usr/bin/journalctl" |
2145 |
- dev="dm-0" ino=37136 res=0 |
2146 |
- |
2147 |
-Signed-off-by: Stefan Berger <stefanb@××××××××××××××.com> |
2148 |
---- |
2149 |
- install/dracut-install.c | 4 ++-- |
2150 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
2151 |
- |
2152 |
-diff --git a/install/dracut-install.c b/install/dracut-install.c |
2153 |
-index fe30bba..c0f1c17 100644 |
2154 |
---- a/install/dracut-install.c |
2155 |
-+++ b/install/dracut-install.c |
2156 |
-@@ -294,7 +294,7 @@ static int cp(const char *src, const char *dst) |
2157 |
- normal_copy: |
2158 |
- pid = fork(); |
2159 |
- if (pid == 0) { |
2160 |
-- execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, |
2161 |
-+ execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps,xattr", "-fL", src, dst, |
2162 |
- NULL); |
2163 |
- _exit(EXIT_FAILURE); |
2164 |
- } |
2165 |
-@@ -302,7 +302,7 @@ static int cp(const char *src, const char *dst) |
2166 |
- while (waitpid(pid, &ret, 0) < 0) { |
2167 |
- if (errno != EINTR) { |
2168 |
- ret = -1; |
2169 |
-- log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src, |
2170 |
-+ log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps,xattr -fL %s %s", src, |
2171 |
- dst); |
2172 |
- break; |
2173 |
- } |