From cab856467b38c981961672851423fce2bb39507d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 23 Jan 2013 16:16:00 +0100 Subject: [PATCH] dracut: update to 025. --- srcpkgs/dracut/dracut-network.template | 2 +- ...5cd2d53c8165a0dc5f857af643fd15faea9d.patch | 25 ------------------- ...97fb6099ed9ee67ed6e19e751be11d38fcf3.patch | 25 ------------------- srcpkgs/dracut/template | 7 +++--- 4 files changed, 4 insertions(+), 55 deletions(-) delete mode 100644 srcpkgs/dracut/patches/636e5cd2d53c8165a0dc5f857af643fd15faea9d.patch delete mode 100644 srcpkgs/dracut/patches/b26897fb6099ed9ee67ed6e19e751be11d38fcf3.patch diff --git a/srcpkgs/dracut/dracut-network.template b/srcpkgs/dracut/dracut-network.template index 66ce891d43..d6f0fc387c 100644 --- a/srcpkgs/dracut/dracut-network.template +++ b/srcpkgs/dracut/dracut-network.template @@ -1,8 +1,8 @@ # Template file for 'dracut-network' # depends="dracut>=${version}" -noarch=yes short_desc="${short_desc} - network modules" +noarch=yes do_install() { for f in 40network 90livenet 95fcoe 95iscsi \ diff --git a/srcpkgs/dracut/patches/636e5cd2d53c8165a0dc5f857af643fd15faea9d.patch b/srcpkgs/dracut/patches/636e5cd2d53c8165a0dc5f857af643fd15faea9d.patch deleted file mode 100644 index 577f175dbe..0000000000 --- a/srcpkgs/dracut/patches/636e5cd2d53c8165a0dc5f857af643fd15faea9d.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 636e5cd2d53c8165a0dc5f857af643fd15faea9d Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 19 Oct 2012 11:09:38 +0200 -Subject: [PATCH 1/4] dracut.sh: only save $kernel_cmdline, if set - ---- - dracut.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dracut.sh b/dracut.sh -index e160641..aab850e 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -937,7 +937,7 @@ fi - if [[ $kernel_only != yes ]]; then - (( ${#install_items[@]} > 0 )) && dracut_install ${install_items[@]} - -- echo "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf" -+ [[ $kernel_cmdline ]] && echo "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf" - - while pop fstab_lines line; do - echo "$line 0 0" >> "${initdir}/etc/fstab" --- -1.8.0 - diff --git a/srcpkgs/dracut/patches/b26897fb6099ed9ee67ed6e19e751be11d38fcf3.patch b/srcpkgs/dracut/patches/b26897fb6099ed9ee67ed6e19e751be11d38fcf3.patch deleted file mode 100644 index deb52255e4..0000000000 --- a/srcpkgs/dracut/patches/b26897fb6099ed9ee67ed6e19e751be11d38fcf3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b26897fb6099ed9ee67ed6e19e751be11d38fcf3 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Fri, 19 Oct 2012 11:20:07 +0200 -Subject: [PATCH] dracut.sh: only 'warn' not 'error', if we don't strip - ---- - dracut.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dracut.sh b/dracut.sh -index aab850e..e463404 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1031,7 +1031,7 @@ fi - if [[ $do_strip = yes ]] ; then - for p in strip xargs find; do - if ! type -P $p >/dev/null; then -- derror "Could not find '$p'. You should run $0 with '--nostrip'." -+ dwarn "Could not find '$p'. Not stripping the initramfs." - do_strip=no - fi - done --- -1.8.0 - diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 6426ac2275..736609661d 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,8 +1,7 @@ # Template file for 'dracut' pkgname=dracut -version=024 -revision=5 -patch_args="-Np1" +version=025 +revision=1 build_style=gnu-makefile make_build_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system" make_install_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system" @@ -16,7 +15,7 @@ short_desc="A new initramfs infrastructure" maintainer="Juan RP " license="GPL-2" distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz" -checksum=d88dc31f326cd6064f7bdcf48a5985bbcfb829fd773b2c0ee93c4c6de86b9f32 +checksum=6851a6fc9e40cb2c5064049f27c1ebc389400e45a99cb69e5f357fd20b46b46c pre_build() { # Remove the nonsense syncheck target.