Remove old revision of 041.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5

5 files changed, 0 insertions, 270 deletions

diff --git a/sys-kernel/dracut/files/041-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/041-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index acd998c4ab00..000000000000
--- a/sys-kernel/dracut/files/041-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d6d86dcc914f6f8a054d24a8d033f645a51509a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/5] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
-
-Conflicts:
-	dracut-functions.sh
----
- dracut-functions.sh | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 37ddca2..0eb36da 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -937,6 +937,16 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -e $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_rule_initqueue "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do
-                 if [[ -e $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-2.3.0
-
diff --git a/sys-kernel/dracut/files/041-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/041-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index a1d41c72de1c..000000000000
--- a/sys-kernel/dracut/files/041-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 86857645052ec06cebc5f57bf81bed3bf142543c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/5] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 26e7314..f9617f0 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-2.3.0
-
diff --git a/sys-kernel/dracut/files/041-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/041-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch
deleted file mode 100644
index 43436a2eb450..000000000000
--- a/sys-kernel/dracut/files/041-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 32c439ed3f62a821827e9b3e7de45789dccbf897 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Wed, 2 Oct 2013 22:37:09 +0200
-Subject: [PATCH 3/5] Use the same paths in dracut.sh as those set with
- configure script
-
-Makefile alters destination main dracut script and sets dracutbasedir to
-the value of pkglibdir set in configure.
----
- Makefile  | 3 +++
- dracut.sh | 9 ++++-----
- 2 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 41ae274..41968b0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -103,6 +103,9 @@ install: dracut-version.sh
- 	mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
- 	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
- 	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
-+	sed -r \
-+		-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
-+		-i $(DESTDIR)$(bindir)/dracut
- 	install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
- 	install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
- 	install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
-diff --git a/dracut.sh b/dracut.sh
-index 5e2feba..89a711e 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -24,10 +24,13 @@
- # store for logging
- dracut_args=( "$@" )
- 
-+# base dirs
-+pkglibdir=/usr/lib/dracut
-+dracutbasedir="$pkglibdir"
-+
- set -o pipefail
- 
- usage() {
--    [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-     if [[ -f $dracutbasedir/dracut-version.sh ]]; then
-         . $dracutbasedir/dracut-version.sh
-     fi
-@@ -52,7 +55,6 @@ EOF
- }
- 
- long_usage() {
--    [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-     if [[ -f $dracutbasedir/dracut-version.sh ]]; then
-         . $dracutbasedir/dracut-version.sh
-     fi
-@@ -666,8 +668,6 @@ export DRACUT_LOG_LEVEL=warning
-     debug=yes
- }
- 
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
--
- # if we were not passed a config file, try the default one
- if [[ ! -f $conffile ]]; then
-     if [[ $allowlocal ]]; then
-@@ -808,7 +808,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
- [[ $use_fstab_l ]] && use_fstab=$use_fstab_l
- [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
- [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
- [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
- [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
- [[ $tmpdir ]] || tmpdir=/var/tmp
--- 
-2.3.0
-
diff --git a/sys-kernel/dracut/files/041-0004-Install-dracut-install-into-libexec-di.patch b/sys-kernel/dracut/files/041-0004-Install-dracut-install-into-libexec-di.patch
deleted file mode 100644
index 637b560ddb8f..000000000000
--- a/sys-kernel/dracut/files/041-0004-Install-dracut-install-into-libexec-di.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 7498b3128103cf77fdef5ccd97205dfd0338fb82 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Wed, 2 Oct 2013 22:40:43 +0200
-Subject: [PATCH 4/5] Install dracut-install into libexec dir instead of lib
- dir
-
-dracut-install script is the only thing ABI specific atm.
-
-See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the
-problem.
----
- Makefile            | 4 +++-
- configure           | 1 +
- dracut-functions.sh | 4 ++++
- dracut.sh           | 1 +
- 4 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 41968b0..b072a23 100644
---- a/Makefile
-+++ b/Makefile
-@@ -104,6 +104,7 @@ install: dracut-version.sh
- 	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
- 	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
- 	sed -r \
-+		-e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \
- 		-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
- 		-i $(DESTDIR)$(bindir)/dracut
- 	install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
-@@ -147,7 +148,8 @@ endif
- 		done \
- 	fi
- 	if [ -f install/dracut-install ]; then \
--		install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
-+		mkdir -p $(DESTDIR)$(libexecdir); \
-+		install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \
- 	fi
- 	if [ -f skipcpio/skipcpio ]; then \
- 		install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
-diff --git a/configure b/configure
-index 0bd3d2d..17370de 100755
---- a/configure
-+++ b/configure
-@@ -59,6 +59,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin}
- mandir ?= ${mandir:-${prefix}/share/man}
- enable_documentation ?= ${enable_documentation:-yes}
- bindir ?= ${bindir:-${prefix}/bin}
-+libexecdir ?= ${libexecdir:-${prefix}/libexec}
- EOF
- 
- {
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 0eb36da..4484e71 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -733,6 +733,10 @@ if ! [[ $DRACUT_INSTALL ]]; then
-     DRACUT_INSTALL=$(find_binary dracut-install)
- fi
- 
-+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then
-+    DRACUT_INSTALL=$libexecdir/dracut-install
-+fi
-+
- if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then
-     DRACUT_INSTALL=$dracutbasedir/dracut-install
- elif ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/install/dracut-install ]]; then
-diff --git a/dracut.sh b/dracut.sh
-index 89a711e..527b32e 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -25,6 +25,7 @@
- dracut_args=( "$@" )
- 
- # base dirs
-+libexecdir=/usr/libexec
- pkglibdir=/usr/lib/dracut
- dracutbasedir="$pkglibdir"
- 
--- 
-2.3.0
-
diff --git a/sys-kernel/dracut/files/041-0005-Take-into-account-lib64-dirs-when-dete.patch b/sys-kernel/dracut/files/041-0005-Take-into-account-lib64-dirs-when-dete.patch
deleted file mode 100644
index da9be91265bc..000000000000
--- a/sys-kernel/dracut/files/041-0005-Take-into-account-lib64-dirs-when-dete.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e776f28b742ed829f5b53ca2079562c9c6c28c8c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 11 Jan 2015 15:10:39 +0100
-Subject: [PATCH 5/5] Take into account lib64 dirs when detecting version,
- modules and params
-
----
- lsinitrd.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lsinitrd.sh b/lsinitrd.sh
-index 4f12c2c..dc1f88f 100755
---- a/lsinitrd.sh
-+++ b/lsinitrd.sh
-@@ -124,7 +124,7 @@ extract_files()
- list_modules()
- {
-     echo "dracut modules:"
--    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
-+    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/modules.txt' 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
-     ((ret+=$?))
- }
- 
-@@ -217,7 +217,7 @@ ret=0
- if (( ${#filenames[@]} > 0 )); then
-     extract_files
- else
--    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
-+    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/dracut-*' 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
-     ((ret+=$?))
-     echo "Version: $version"
-     echo
-@@ -226,7 +226,7 @@ else
-         echo "========================================================================"
-     else
-         echo -n "Arguments: "
--        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null
-+        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/build-parameter.txt' 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null
-         echo
-         list_modules
-         list_files
--- 
-2.3.0
-