jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dracut: backport change from git master to add modules for specified kernel.

Browse source
This commit is contained in:
Juan RP 2012-07-06 10:38:12 +02:00
parent 4fa810ad41
commit 02318516a0
2 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
srcpkgs/dracut/patches/dracut-xarguments.patch
View file

@ -1,23 +1,5 @@
--- dracut.sh.orig 2012-07-03 10:08:45.753718694 +0200
+++ dracut.sh 2012-07-03 10:08:53.968524889 +0200
@@ -825,7 +825,7 @@ if [[ $kernel_only != yes ]]; then
find "$initdir" -type f \
'(' -perm -0100 -or -perm -0010 -or -perm -0001 ')' \
-not -path '*.ko' -print0 \
- | xargs -0 dracut-install ${initdir+-D "$initdir"} -R ${DRACUT_FIPS_MODE+-H}
+ | xargs -r -0 dracut-install ${initdir+-D "$initdir"} -R ${DRACUT_FIPS_MODE+-H}
dinfo "*** Resolving executable dependencies done***"
fi
@@ -849,7 +849,7 @@ fi
# strip binaries
if [[ $do_strip = yes ]] ; then
- for p in strip xargs find; do
+ for p in strip xargs -r find; do
if ! type -P $p >/dev/null; then
derror "Could not find '$p'. You should run $0 with '--nostrip'."
do_strip=no
--- dracut.sh.orig 2012-07-06 10:31:36.651370365 +0200
+++ dracut.sh 2012-07-06 10:31:53.234973758 +0200
@@ -877,7 +877,7 @@ if [[ $do_strip = yes ]] ; then
find "$initdir" -type f \
'(' -perm -0100 -or -perm -0010 -or -perm -0001 \
@ -27,14 +9,14 @@
dinfo "*** Stripping files done ***"
fi
--- dracut-functions.sh.orig 2012-07-03 10:09:04.056286970 +0200
+++ dracut-functions.sh 2012-07-03 10:09:19.674415038 +0200
--- dracut-functions.sh.orig 2012-07-06 10:32:18.282374771 +0200
+++ dracut-functions.sh 2012-07-06 10:33:41.727379388 +0200
@@ -1182,7 +1182,7 @@ dracut_kernel_post() {
local _moddirname=${srcmods%%/lib/modules/*}
if [[ -f "$initdir/.kernelmodseen/lazylist" ]]; then
- xargs modprobe -a ${_moddirname+-d ${_moddirname}/} --ignore-install --show-depends \
+ xargs -r modprobe -a ${_moddirname+-d ${_moddirname}/} --ignore-install --show-depends \
+ xargs -r modprobe -a ${_moddirname+-d ${_moddirname}/} --ignore-install --show-depends --set-version $kernel \
< "$initdir/.kernelmodseen/lazylist" 2>/dev/null \
| sort -u \
| while read _cmd _modpath _options; do

2
srcpkgs/dracut/template
View file

@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
version=020
revision=5
revision=6
build_style=gnu-makefile
make_build_args="sysconfdir=/etc systemdsystemunitdir=/lib/systemd/system"
make_install_args="sysconfdir=/etc systemdsystemunitdir=/lib/systemd/system"