[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/files/

[gentoo-commits] repo/gentoo:master commit in: sys-boot/elilo/files/

[Aaron Bauman]

commit:     640116a01cbe388676ce5d70f97f06d492e0ebdb
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec  6 11:07:58 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 15:38:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640116a0

sys-boot/elilo: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13893
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 sys-boot/elilo/files/elilo.sh-chkspace.patch | 15 ----------
 sys-boot/elilo/files/elilo.sh-vmm.patch      | 43 ----------------------------
 2 files changed, 58 deletions(-)

diff --git a/sys-boot/elilo/files/elilo.sh-chkspace.patch b/sys-boot/elilo/files/elilo.sh-chkspace.patch
deleted file mode 100644
index 710780e8da6..00000000000
--- a/sys-boot/elilo/files/elilo.sh-chkspace.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Don't count duplicate files twice when summing bytesneeded
-
---- elilo/debian/elilo.sh.chkspace	2006-03-16 07:53:00.000000000 -0500
-+++ elilo/debian/elilo.sh	2006-03-16 07:53:27.000000000 -0500
-@@ -580,7 +580,9 @@
- 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
-     vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \
- 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
--    bytesneeded=`cat $imagefiles $initrdfiles $vmmfiles 2>/dev/null | wc -c`
-+    allfiles=`for f in $imagefiles $initrdfiles $install $bootconf; do \
-+	echo $f; done | sort -u`
-+    bytesneeded=`cat $allfiles 2>/dev/null | wc -c`
-     # convert to KB, allowing 5% overhead
-     kbneeded=$(( bytesneeded / 1024 + bytesneeded / 20480 ))
-     kbavailable=$(df -P -k $TARGET | sed -n "s|^$boot[[:space:]]\+[0-9]\+[[:space:]]\+[0-9]\+[[:space:]]\+\([0-9]\+\).*$|\1|p")

diff --git a/sys-boot/elilo/files/elilo.sh-vmm.patch b/sys-boot/elilo/files/elilo.sh-vmm.patch
deleted file mode 100644
index 294eb03b222..00000000000
--- a/sys-boot/elilo/files/elilo.sh-vmm.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Patch from Alex Williamson in
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350185 support of vmm= in the
-elilo script
-
---- elilo/debian/elilo.sh.novmm	2006-03-16 07:49:19.000000000 -0500
-+++ elilo/debian/elilo.sh	2006-03-16 07:48:47.000000000 -0500
-@@ -364,6 +364,8 @@
- 		sed 's/^image[[:space:]]*=[[:space:]]*//' | grep -v ':'`
-     initrdfiles=`grep '^[[:space:]]*initrd[[:space:]]*=' $bootconf | \
- 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
-+    vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \
-+		sed 's/.*=[[:space:]]*//' | grep -v ':'`
- 
-     ## Point of no return, removing the old EFI/debian tree
-     rm -rf $TARGET/$EFIROOT
-@@ -398,6 +400,7 @@
- 	-e "s|\t| |g" \
- 	-e "s|\(^image[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \
- 	-e "s|\(^[[:space:]]*initrd[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \
-+	-e "s|\(^[[:space:]]*vmm[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \
- 	< "$bootconf" > "$TARGET/$EFIROOT/$CFFILE"
-     if [ $? != 0 ] ; then
- 	echo 1>&2 "$PRG: An error occured while writing to $boot"
-@@ -406,7 +409,7 @@
- 
-     [ "$DEBUG" = 1 ] && echo "----" && cat "$TARGET/$EFIROOT/$CFFILE" && echo "----"
- 
--    for i in $imagefiles $initrdfiles; do
-+    for i in $imagefiles $initrdfiles $vmmfiles; do
- 	[ "$VERBOSE" = 1 ] && echo "$PRG: Installing $i on $boot..."
- 	if [ -f $i ]; then
- 	    mkdir -p `dirname "$TARGET/$EFIROOT/$i"`
-@@ -575,7 +578,9 @@
- 		sed 's/^image[[:space:]]*=[[:space:]]*//' | grep -v ':'`
-     initrdfiles=`grep '^[[:space:]]*initrd[[:space:]]*=' $bootconf | \
- 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
--    bytesneeded=`cat $imagefiles $initrdfiles $install $bootconf 2>/dev/null | wc -c`
-+    vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \
-+		sed 's/.*=[[:space:]]*//' | grep -v ':'`
-+    bytesneeded=`cat $imagefiles $initrdfiles $vmmfiles 2>/dev/null | wc -c`
-     # convert to KB, allowing 5% overhead
-     kbneeded=$(( bytesneeded / 1024 + bytesneeded / 20480 ))
-     kbavailable=$(df -P -k $TARGET | sed -n "s|^$boot[[:space:]]\+[0-9]\+[[:space:]]\+[0-9]\+[[:space:]]\+\([0-9]\+\).*$|\1|p")