add modified elilo

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2734 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-11-12 21:15:33 +00:00
parent 5ecd42aa4f
commit 94b5c1933a
7 changed files with 271 additions and 0 deletions

113
sys-boot/elilo/ChangeLog Normal file
View File

@ -0,0 +1,113 @@
# ChangeLog for sys-boot/elilo
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/ChangeLog,v 1.25 2010/07/24 15:39:17 armin76 Exp $
24 Jul 2010; Raúl Porcel <armin76@gentoo.org> -elilo-3.8.ebuild,
elilo-3.12.ebuild:
ia64 stable
*elilo-3.12 (10 Jan 2010)
10 Jan 2010; Raúl Porcel <armin76@gentoo.org> elilo-3.10.ebuild,
+elilo-3.12.ebuild:
ia64 stable, version bump
*elilo-3.10 (02 Jun 2009)
02 Jun 2009; Raúl Porcel <armin76@gentoo.org> +elilo-3.10.ebuild:
Version bump
06 May 2009; Markus Meier <maekke@gentoo.org> elilo-3.8.ebuild:
add ~amd64, bug #208639
14 Feb 2008; Christian Faulhammer <opfer@gentoo.org> elilo-3.8.ebuild:
keyworded ~arch for x86, bug 208639
*elilo-3.8 (08 Feb 2008)
08 Feb 2008; Raúl Porcel <armin76@gentoo.org>
-files/elilo-3.3a-devscheme.patch, -files/elilo.8-3.4,
-files/eliloalt.8-3.4, -files/elilo-3.4-makefile.patch,
-files/elilo-3.4-proc-sigsetjmp.patch, -elilo-3.4-r3.ebuild,
-elilo-3.6.ebuild, +elilo-3.8.ebuild:
Version bump wrt #208639, thanks to plasmaroo for testing
22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
Redigest for Manifest2
19 Oct 2006; Aron Griffis <agriffis@gentoo.org>
elilo-3.6_p20060314.ebuild:
Mark 3.6_p20060314 stable on ia64
*elilo-3.6_p20060314 (16 Mar 2006)
16 Mar 2006; Aron Griffis <agriffis@gentoo.org>
+files/elilo.sh-chkspace.patch, +files/elilo.sh-vmm.patch,
+elilo-3.6_p20060314.ebuild:
Bump to post-3.6 nightly snapshot with Xen fixes
10 Mar 2006; Aron Griffis <agriffis@gentoo.org> elilo-3.4-r3.ebuild,
elilo-3.6.ebuild:
Add elilo-3.4.gz to SRC_URI to fix script installation
23 Feb 2006; Aron Griffis <agriffis@gentoo.org> +metadata.xml,
elilo-3.4-r3.ebuild, elilo-3.6.ebuild:
Move elilo script to mirrors
14 Feb 2006; Aron Griffis <agriffis@gentoo.org> elilo-3.6.ebuild:
Mark stable immediately since older versions can't boot with initramfs
*elilo-3.6 (14 Feb 2006)
14 Feb 2006; Aron Griffis <agriffis@gentoo.org> +elilo-3.6.ebuild:
Bump to 3.6 (from 3.4-r3) (fixes initramfs corruption on ia64)
03 Jan 2006; Tim Yamin <plasmaroo@gentoo.org> files/elilo-3.4:
Always define $loop in the elilo script to prevent it getting imported from
the environment.
03 Oct 2005; Aron Griffis <agriffis@gentoo.org> elilo-3.4-r3.ebuild:
Add PROVIDE=virtual/bootloader #107940
*elilo-3.4-r3 (02 Aug 2005)
02 Aug 2005; Aron Griffis <agriffis@gentoo.org> files/elilo.conf.sample,
-elilo-3.4-r1.ebuild, -elilo-3.4-r2.ebuild, +elilo-3.4-r3.ebuild:
Stabilize -r2 with vapier's ebuild updates, but bump it to -r3 at the same
time to push out repaired sample elilo.conf
*elilo-3.4-r2 (06 May 2005)
06 May 2005; Mike Frysinger <vapier@gentoo.org>
+files/elilo-3.4-proc-sigsetjmp.patch, +elilo-3.4-r2.ebuild:
Fix building with newer binutils and clean up the src_install to use Gentoo
style install.
*elilo-3.4-r1 (30 Mar 2005)
30 Mar 2005; <plasmaroo@gentoo.org> +elilo-3.4-r1.ebuild, files/elilo-3.4:
Backport --efiboot fix for 2.6 kernels from Debian.
22 Jan 2005; <plasmaroo@gentoo.org> elilo-3.4.ebuild:
Fix total build breakage; inherit toolchain-funcs please...
19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> elilo-3.4.ebuild:
fix depend (bug #45110); tidy
04 Mar 2004; <agriffis@gentoo.org> elilo-3.4.ebuild:
stable on ia64
23 Jan 2004; <agriffis@gentoo.org> elilo-3.4.ebuild,
files/elilo.conf.sample:
add elilo.conf.sample
23 Jan 2004; <agriffis@gentoo.org> elilo-3.4.ebuild:
add rdepend on dosfstools
*elilo-3.4 (23 Jan 2004)
23 Jan 2004; <agriffis@gentoo.org> elilo-3.4.ebuild,
files/elilo-3.3a-devscheme.patch, files/elilo-3.4,
files/elilo-3.4-makefile.patch, files/elilo.8-3.4, files/eliloalt.8-3.4:
New ebuild for elilo, stolen from Mandrake and Debian

14
sys-boot/elilo/Manifest Normal file
View File

@ -0,0 +1,14 @@
AUX elilo.conf.sample 150 RMD160 d268dd0c0b18b1467694acab4c9f1943b713b532 SHA1 26aa384031ef0fec22313bda692cd03ab1670df7 SHA256 aa42c5582f5b282ed1fe5ef85c2c190e7c66283da905c4ef23886d313845d353
AUX elilo.sh-chkspace.patch 833 RMD160 d9c36a3726cbefe20e6ee6b54014d2eb3c2bc413 SHA1 c988a6aa606aa578cc652d486062a7346781dd3d SHA256 bcab65496766878d6cd4c8aca9abf83145fc14fe659dc524756f210a0301a118
AUX elilo.sh-vmm.patch 2099 RMD160 888dd1d63a05f87feb6c69133eec7326bebbb556 SHA1 1beab1aec4ef4c1db0f1287f231873fbfa4b630a SHA256 250fe3d335b8810d33de868f3599b11ab5b3b93bc27ed45344c7f1c675c5a10c
DIST elilo-3.10.tar.gz 210896 RMD160 37884f49b7b282a7552a6d7ab0188e5a5809170e SHA1 367bfb9fa8b42566a7c9577e75fd6c707eebe323 SHA256 65d0d7cc31bd0ef6824b9394dbf8991eb850aa4ba2dde1f9302e3da3cb2a4399
DIST elilo-3.12-source.tar.gz 215125 RMD160 768b300ede3140c2278ad73206e6d511d4307e8d SHA1 3df5a611c171c9b1997af880947aa5c9cf729597 SHA256 5005534ae972603c65caa8debb2bf3c4a22b895588323bc1b0a7a9f114e030ee
DIST elilo-nightly_2006-03-14.tgz 168991 RMD160 ea5952bff2563fa22b09135d68d2012fd2abfcae SHA1 3900f7adbae1fc70775a8b446341349427dcdffe SHA256 b5174f1d921212b65f708869ea374e7c3e4e1b0771738b03ae6a1830cb4fe65c
DIST elilo_3.10-1.diff.gz 26456 RMD160 1316ba389421ac319e0603f08b0573036c773c80 SHA1 b3dc7c70a5ea030894e99e5ee1104b70d9cb2035 SHA256 de81eb071d4c7a3f02c629911cfd95f0fdc8705575df7a596e5630788bbb3643
DIST elilo_3.12-1.diff.gz 28806 RMD160 4421609562735a4ba36b736c626d35bef05c769e SHA1 73a6efe6e3885553af3f3c1836db8befea3da304 SHA256 26532bdf9a8c3455d12f22c59d1d5d9656dcb432dabd1a80cdbcd010e93305b5
DIST elilo_3.6-1.diff.gz 14944 RMD160 6edb6f85187724ac1f798d894cbd99242ce2d62b SHA1 e04bc93716c52170223821d14c203c0623ad73c4 SHA256 cc9e3d753823ad1bc50f935017e8b5cdc5d76cac2a37c498c862ef021e0e0073
EBUILD elilo-3.10.ebuild 2008 RMD160 61859b5fa4ec44af72fc6b378d43e0362d4650df SHA1 f57d1c59277b617ff28b6f8edd23ffef7450c207 SHA256 4f95dd102c593c6316fecb9d2825a100a922bebce28e88b5cd8a7ad30061ef4a
EBUILD elilo-3.12.ebuild 2002 RMD160 7ce77f7f5a76928964b4b4ecb41e7b2f3d0c6341 SHA1 d3ebbefc1a81ad72595106f5dcb76bc60599a91d SHA256 9d9d6a5b8c9f31ed1cf502bf748f2712a6b393e0e18cd7c623f793d18dacef65
EBUILD elilo-3.6_p20060314.ebuild 2427 RMD160 37ec6d9311127c5a62051d8781f93bf9684ec4a0 SHA1 e910da571a12c569632c5b0fa82717bca7a96fcf SHA256 8169f6ff1f4ade79eabab9c121a783cb60e826f35d2427da9478a5a7a75c2fff
MISC ChangeLog 3873 RMD160 80be30e60fb8ef88a66c0524ffe802cfe877f5f1 SHA1 a27fbeb675650aaf7cf01abdbeaa46467104aad9 SHA256 3b837864e0af2a425154b82c79bc74d0bbaad10d06552ce52b00b5e6e8e6ef62
MISC metadata.xml 157 RMD160 d78bc90d4c0fdb88250c9822e913c6f0159b2e8b SHA1 337a3ca895783b15c7f1fdf721f88b41a4b2e94e SHA256 7e261fbe78f2088ab2a27fe3bd23a4224dde9a11031edcb4b7bb95dd3ba1fe4a

View File

@ -0,0 +1,72 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/elilo-3.12.ebuild,v 1.2 2010/07/24 15:39:17 armin76 Exp $
inherit toolchain-funcs eutils mount-efi
DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
HOMEPAGE="http://elilo.sourceforge.net/"
SRC_URI="mirror://sourceforge/elilo/${P}-source.tar.gz"
SRC_URI="${SRC_URI} mirror://debian/pool/main/e/elilo/elilo_3.12-1.diff.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ia64 ~x86"
IUSE=""
# gnu-efi contains only static libs, so there's no run-time dep on it
DEPEND=">=sys-boot/gnu-efi-3.0g
sys-devel/patch
dev-util/patchutils"
RDEPEND="sys-boot/efibootmgr
sys-fs/dosfstools"
PROVIDE="virtual/bootloader"
src_unpack() {
unpack ${A}
cd "${S}"
ebegin Applying ../*.diff
# Using epatch on this is annoying because it wants to create the elilo-3.6/
# directory. Since all the files are new, it doesn't know better.
filterdiff -p1 -i debian/\* ../*.diff | patch -s -p1
eend $? || return
# Now Gentooize it
sed -i "
1s:/bin/sh:/bin/bash:;
s/##VERSION##/$PV/;
s/Debian GNU\//Gentoo /g;
s/Debian/Gentoo/g;
s/debian/gentoo/g;
s/dpkg --print-architecture/uname -m/" debian/elilo.sh
}
src_compile() {
local iarch
case $(tc-arch) in
ia64) iarch=ia64 ;;
x86) iarch=ia32 ;;
amd64) iarch=x86_64 ;;
*) die "unknown architecture: $(tc-arch)" ;;
esac
# "prefix" on the next line specifies where to find gcc, as, ld,
# etc. It's not the usual meaning of "prefix". By blanking it we
# allow PATH to be searched.
emake -j1 prefix= CC="$(tc-getCC)" ARCH=${iarch} || die "emake failed"
}
src_install() {
exeinto /boot/efi/EFI/elilo
doexe elilo.efi || die "elilo.efi failed"
newsbin debian/elilo.sh elilo || die "elilo failed"
dosbin tools/eliloalt || die "eliloalt failed"
insinto /etc
newins "${FILESDIR}"/elilo.conf.sample elilo.conf
dodoc docs/* "${FILESDIR}"/elilo.conf.sample
doman debian/*.[0-9]
}

View File

@ -0,0 +1,9 @@
boot=/dev/sda1
install=/usr/lib/elilo/elilo.efi
delay=20
default=gentoo
image=/boot/kernel-2.6.12-gentoo-r6
label=gentoo
root=/dev/sda3
read-only

View File

@ -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")

View File

@ -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")

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>ia64</herd>
</pkgmetadata>