From c05528a08c976e79b0af06cf527b133e41fe5858 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Jun 2014 12:18:55 +0200 Subject: [PATCH] dracut: update to 038. --- .../dracut/patches/fix-parse-i18n.sh.patch | 13 --------- srcpkgs/dracut/patches/fix-parse-resume.patch | 27 ------------------- srcpkgs/dracut/template | 7 +++-- 3 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/dracut/patches/fix-parse-i18n.sh.patch delete mode 100644 srcpkgs/dracut/patches/fix-parse-resume.patch diff --git a/srcpkgs/dracut/patches/fix-parse-i18n.sh.patch b/srcpkgs/dracut/patches/fix-parse-i18n.sh.patch deleted file mode 100644 index 3154799ca2..0000000000 --- a/srcpkgs/dracut/patches/fix-parse-i18n.sh.patch +++ /dev/null @@ -1,13 +0,0 @@ -typo fix that avoids '1=""' in generated vconsole.conf. - ---- modules.d/10i18n/parse-i18n.sh.orig 2014-04-28 12:44:54.540715927 +0200 -+++ modules.d/10i18n/parse-i18n.sh 2014-04-28 12:45:10.587813907 +0200 -@@ -12,7 +12,7 @@ inst_key_val() { - _value="$(getarg $@)" - [ -z "${_value}" ] && _value=$_default - if [ -n "${_value}" ]; then -- printf '%s="%s"\n' $key ${_value} >> $_file -+ printf '%s="%s"\n' ${_key} ${_value} >> $_file - fi - unset _file - unset _value diff --git a/srcpkgs/dracut/patches/fix-parse-resume.patch b/srcpkgs/dracut/patches/fix-parse-resume.patch deleted file mode 100644 index 4cc566c6ba..0000000000 --- a/srcpkgs/dracut/patches/fix-parse-resume.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 636cc1ef634704ffc5e037961b6fb8ede3203977 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 7 May 2014 15:30:01 +0200 -Subject: resume/parse-resume.sh: correctly write timeout hook - - -diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh -index d7b2d7f..6ab59c3 100755 ---- modules.d/95resume/parse-resume.sh -+++ modules.d/95resume/parse-resume.sh -@@ -70,9 +70,10 @@ if ! getarg noresume; then - printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \ - "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh - -- printf -- "%s" 'warn "Cancelling resume operation. Device not found.";' -- printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' \ -- "$hookdir" >> $hookdir/initqueue/timeout/resume.sh -+ { -+ printf -- "%s" 'warn "Cancelling resume operation. Device not found.";' -+ printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' "$hookdir" -+ } >> $hookdir/initqueue/timeout/resume.sh - - mv /lib/dracut/resume.sh /lib/dracut/hooks/pre-mount/10-resume.sh - else --- -cgit v0.10.1 - diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 066545ceba..443c2bcddd 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut -version=037 -revision=3 +version=038 +revision=1 build_style=meta hostmakedepends="libxslt docbook-xsl asciidoc" makedepends="psmisc cpio xz" @@ -15,12 +15,11 @@ short_desc="A new initramfs infrastructure" maintainer="Juan RP " license="GPL-2" distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz" -checksum=9c4c365c8dabc19b66da2972bbed7b983df520481325b8a37d3f620218620d76 +checksum=3b0d4466ff5bb627fcc783f02a757187195567b97bdbf46203dfa4cf52ed6b70 do_build() { make ${makejobs} sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system } - do_install() { # fix path to busybox. sed -i "s|/sbin/busybox|/bin/busybox|g" modules.d/05busybox/module-setup.sh