Added missing epatch and improved patches a bit btw.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key E1DBFAB5)

5 files changed, 36 insertions, 45 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index c149f21a6f2c..411219ff9dfe 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.93 2012/11/01 10:51:53 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.94 2012/11/01 19:30:47 aidecoe Exp $
+
+*dracut-024-r2 (01 Nov 2012)
+*dracut-023-r4 (01 Nov 2012)
+
+  01 Nov 2012; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  files/024-0001-Fallback-to-external-blkid-and-path_id.patch,
+  files/023-0003-Fallback-to-external-blkid-and-path_id.patch,
+  -dracut-023-r3.ebuild, +dracut-023-r4.ebuild, -dracut-024-r1.ebuild,
+  +dracut-024-r2.ebuild:
+  Added missing epatch and improved patches a bit btw.
 
   01 Nov 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-014-r3.ebuild,
   dracut-018-r3.ebuild, dracut-019-r6.ebuild, dracut-022-r6.ebuild,
diff --git a/sys-kernel/dracut/dracut-023-r3.ebuild b/sys-kernel/dracut/dracut-023-r4.ebuild
index 47440e276145..02b1e1de0cf6 100644
--- a/sys-kernel/dracut/dracut-023-r3.ebuild
+++ b/sys-kernel/dracut/dracut-023-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-023-r3.ebuild,v 1.1 2012/11/01 09:54:08 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-023-r4.ebuild,v 1.1 2012/11/01 19:30:47 aidecoe Exp $
 
 EAPI=4
 
@@ -151,6 +151,8 @@ rm_module() {
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-find_binary-path-s.patch"
 	epatch "${FILESDIR}/${PV}-0002-90crypt-call-systemd-commands-only-if-.patch"
+	epatch "${FILESDIR}/${PV}-0003-Fallback-to-external-blkid-and-path_id.patch"
+	chmod +x "${S}/modules.d/95udev-rules/udev-rules-prepare.sh"
 
 	local udevdir="$($(tc-getPKG_CONFIG) udev --variable=udevdir)"
 	[[ ${udevdir} ]] || die "Couldn't detect udevdir"
diff --git a/sys-kernel/dracut/dracut-024-r1.ebuild b/sys-kernel/dracut/dracut-024-r2.ebuild
index a38e512351fe..8eeab7db9302 100644
--- a/sys-kernel/dracut/dracut-024-r1.ebuild
+++ b/sys-kernel/dracut/dracut-024-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-024-r1.ebuild,v 1.1 2012/11/01 09:54:08 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-024-r2.ebuild,v 1.1 2012/11/01 19:30:47 aidecoe Exp $
 
 EAPI=4
 
@@ -149,6 +149,9 @@ rm_module() {
 #
 
 src_prepare() {
+	epatch "${FILESDIR}/${PV}-0001-Fallback-to-external-blkid-and-path_id.patch"
+	chmod +x "${S}/modules.d/95udev-rules/udev-rules-prepare.sh"
+
 	local udevdir="$($(tc-getPKG_CONFIG) udev --variable=udevdir)"
 	[[ ${udevdir} ]] || die "Couldn't detect udevdir"
 	einfo "Setting udevdir to ${udevdir}..."
diff --git a/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch b/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch
index 0212acfd6404..97b4e462dcfd 100644
--- a/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch
+++ b/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch
@@ -1,4 +1,4 @@
-From e185a1b4fd7e931beb995b124fd3688031e50863 Mon Sep 17 00:00:00 2001
+From ee71a87472029c1838d0c834e9610ee578cb6d7f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
 Date: Thu, 1 Nov 2012 09:31:01 +0100
 Subject: [PATCH 3/3] Fallback to external blkid and path_id in udev rules for
@@ -15,10 +15,9 @@ All credits go to Alexander Tsoy <alexander@tsoy.me>; see
  modules.d/95udev-rules/59-persistent-storage.rules |  8 +++----
  modules.d/95udev-rules/61-persistent-storage.rules |  2 +-
  modules.d/95udev-rules/module-setup.sh             |  2 ++
- modules.d/95udev-rules/udev-rules-prepare.sh       | 25 ++++++++++++++++++++++
- modules.d/99base/init.sh                           |  2 +-
- 5 files changed, 33 insertions(+), 6 deletions(-)
- create mode 100644 modules.d/95udev-rules/udev-rules-prepare.sh
+ modules.d/95udev-rules/udev-rules-prepare.sh       | 27 ++++++++++++++++++++++
+ 4 files changed, 34 insertions(+), 5 deletions(-)
+ create mode 100755 modules.d/95udev-rules/udev-rules-prepare.sh
 
 diff --git a/modules.d/95udev-rules/59-persistent-storage.rules b/modules.d/95udev-rules/59-persistent-storage.rules
 index f2756ee..c221cda 100644
@@ -79,15 +78,17 @@ index 2e3c955..a9a8655 100755
  }
  
 diff --git a/modules.d/95udev-rules/udev-rules-prepare.sh b/modules.d/95udev-rules/udev-rules-prepare.sh
-new file mode 100644
-index 0000000..08263ea
+new file mode 100755
+index 0000000..a340e38
 --- /dev/null
 +++ b/modules.d/95udev-rules/udev-rules-prepare.sh
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,27 @@
 +#!/bin/sh
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 +# ex: ts=8 sw=4 sts=4 et filetype=sh
 +
++[ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
++
 +for f in /etc/udev/rules.d/*-persistent-storage.rules; do
 +    [ -e "$f" ] || continue
 +    while read line; do
@@ -109,19 +110,6 @@ index 0000000..08263ea
 +    done < "${f}" > "${f}.new"
 +    mv "${f}.new" "$f"
 +done
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 16c8958..0259053 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -83,7 +83,7 @@ trap "emergency_shell Signal caught!" 0
- 
- [ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs
- 
--UDEVVERSION=$(udevadm --version)
-+export UDEVVERSION=$(udevadm --version)
- if [ $UDEVVERSION -gt 166 ]; then
-     # newer versions of udev use /run/udev/rules.d
-     export UDEVRULESD=/run/udev/rules.d
 -- 
 1.7.12.4
 
diff --git a/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch b/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch
index e42bff1e4e7e..0315e3b9f9ee 100644
--- a/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch
+++ b/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch
@@ -1,4 +1,4 @@
-From 226fb690900d869c0f8542ea5983c1c4ec3ac9db Mon Sep 17 00:00:00 2001
+From 2a0b056b156c471a8cf5cbac918f9bfc30f86e06 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
 Date: Thu, 1 Nov 2012 09:31:01 +0100
 Subject: [PATCH] Fallback to external blkid and path_id in udev rules for
@@ -15,10 +15,9 @@ All credits go to Alexander Tsoy <alexander@tsoy.me>; see
  modules.d/95udev-rules/59-persistent-storage.rules |  8 +++----
  modules.d/95udev-rules/61-persistent-storage.rules |  2 +-
  modules.d/95udev-rules/module-setup.sh             |  2 ++
- modules.d/95udev-rules/udev-rules-prepare.sh       | 25 ++++++++++++++++++++++
- modules.d/99base/init.sh                           |  2 +-
- 5 files changed, 33 insertions(+), 6 deletions(-)
- create mode 100644 modules.d/95udev-rules/udev-rules-prepare.sh
+ modules.d/95udev-rules/udev-rules-prepare.sh       | 27 ++++++++++++++++++++++
+ 4 files changed, 34 insertions(+), 5 deletions(-)
+ create mode 100755 modules.d/95udev-rules/udev-rules-prepare.sh
 
 diff --git a/modules.d/95udev-rules/59-persistent-storage.rules b/modules.d/95udev-rules/59-persistent-storage.rules
 index f2756ee..c221cda 100644
@@ -79,15 +78,17 @@ index 533dfeb..54a192e 100755
  }
  
 diff --git a/modules.d/95udev-rules/udev-rules-prepare.sh b/modules.d/95udev-rules/udev-rules-prepare.sh
-new file mode 100644
-index 0000000..08263ea
+new file mode 100755
+index 0000000..a340e38
 --- /dev/null
 +++ b/modules.d/95udev-rules/udev-rules-prepare.sh
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,27 @@
 +#!/bin/sh
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 +# ex: ts=8 sw=4 sts=4 et filetype=sh
 +
++[ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
++
 +for f in /etc/udev/rules.d/*-persistent-storage.rules; do
 +    [ -e "$f" ] || continue
 +    while read line; do
@@ -109,19 +110,6 @@ index 0000000..08263ea
 +    done < "${f}" > "${f}.new"
 +    mv "${f}.new" "$f"
 +done
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 16c8958..0259053 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -83,7 +83,7 @@ trap "emergency_shell Signal caught!" 0
- 
- [ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs
- 
--UDEVVERSION=$(udevadm --version)
-+export UDEVVERSION=$(udevadm --version)
- if [ $UDEVVERSION -gt 166 ]; then
-     # newer versions of udev use /run/udev/rules.d
-     export UDEVRULESD=/run/udev/rules.d
 -- 
 1.7.12.4