Bump to post-3.6 nightly snapshot with Xen fixes

(Portage version: 2.1_pre5-r4)

3 files changed, 64 insertions, 0 deletions

diff --git a/sys-boot/elilo/files/digest-elilo-3.6_p20060314 b/sys-boot/elilo/files/digest-elilo-3.6_p20060314
new file mode 100644
index 000000000000..f1c3778df47f
--- /dev/null
+++ b/sys-boot/elilo/files/digest-elilo-3.6_p20060314
@@ -0,0 +1,6 @@
+MD5 3b23007224435933d1ec8f075848f881 elilo-nightly_2006-03-14.tgz 168991
+RMD160 ea5952bff2563fa22b09135d68d2012fd2abfcae elilo-nightly_2006-03-14.tgz 168991
+SHA256 b5174f1d921212b65f708869ea374e7c3e4e1b0771738b03ae6a1830cb4fe65c elilo-nightly_2006-03-14.tgz 168991
+MD5 323e7fec2e398073d92c4cccd0307c18 elilo_3.6-1.diff.gz 14944
+RMD160 6edb6f85187724ac1f798d894cbd99242ce2d62b elilo_3.6-1.diff.gz 14944
+SHA256 cc9e3d753823ad1bc50f935017e8b5cdc5d76cac2a37c498c862ef021e0e0073 elilo_3.6-1.diff.gz 14944
diff --git a/sys-boot/elilo/files/elilo.sh-chkspace.patch b/sys-boot/elilo/files/elilo.sh-chkspace.patch
new file mode 100644
index 000000000000..710780e8da6c
--- /dev/null
+++ b/sys-boot/elilo/files/elilo.sh-chkspace.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000000..294eb03b2226
--- /dev/null
+++ b/sys-boot/elilo/files/elilo.sh-vmm.patch
@@ -0,0 +1,43 @@
+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")