diff options
author | Tony Vroon <chainsaw@gentoo.org> | 2006-09-25 13:09:38 +0000 |
---|---|---|
committer | Tony Vroon <chainsaw@gentoo.org> | 2006-09-25 13:09:38 +0000 |
commit | 08cdc5b3d0792432788bb42a9c731a28a3e1e85a (patch) | |
tree | a8cbc141407b88b4a92663844eefe7cc863878fb /sys-boot/lilo | |
parent | Fixed name of bttrack.rc in ebuild (did not match the one in files/) (diff) | |
download | historical-08cdc5b3d0792432788bb42a9c731a28a3e1e85a.tar.gz historical-08cdc5b3d0792432788bb42a9c731a28a3e1e85a.tar.bz2 historical-08cdc5b3d0792432788bb42a9c731a28a3e1e85a.zip |
Version bump.
Package-Manager: portage-2.1.2_pre1
Diffstat (limited to 'sys-boot/lilo')
-rw-r--r-- | sys-boot/lilo/Manifest | 26 | ||||
-rw-r--r-- | sys-boot/lilo/files/digest-lilo-22.7.3 | 6 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.7.3-correct-usage-info.patch | 12 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.7.3-makefile.patch | 46 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.7.3-novga.patch | 25 | ||||
-rw-r--r-- | sys-boot/lilo/lilo-22.7.3.ebuild | 183 |
6 files changed, 295 insertions, 3 deletions
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index b7c34e337a39..d4604e271e11 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -65,6 +65,18 @@ AUX lilo-22.7.2-novga.patch 804 RMD160 1b2391b1f92d48c1db5623ec9b4eec34844078d6 MD5 e42ba9cd707df24649879cc297377cf9 files/lilo-22.7.2-novga.patch 804 RMD160 1b2391b1f92d48c1db5623ec9b4eec34844078d6 files/lilo-22.7.2-novga.patch 804 SHA256 812da9b2afb785a0aca27fe9b0d8a06b982792d60cd6b4b6dda16c7b6a73b297 files/lilo-22.7.2-novga.patch 804 +AUX lilo-22.7.3-correct-usage-info.patch 557 RMD160 00947306d7b609ae0a0129e0a3f820a51a4d1f75 SHA1 572ae21eb4f65aed1410638fbd416eb4cee6d64c SHA256 dc32b41ef2024c7b38b3dde281ac1dae69f9353ce56adce79ca4030b13c65281 +MD5 de6a5065fca97cf5df35c8bc9bebfafc files/lilo-22.7.3-correct-usage-info.patch 557 +RMD160 00947306d7b609ae0a0129e0a3f820a51a4d1f75 files/lilo-22.7.3-correct-usage-info.patch 557 +SHA256 dc32b41ef2024c7b38b3dde281ac1dae69f9353ce56adce79ca4030b13c65281 files/lilo-22.7.3-correct-usage-info.patch 557 +AUX lilo-22.7.3-makefile.patch 1894 RMD160 ff3674d256a4df122fc095b5a2571154979fe41b SHA1 e8c4251c84a7ec9471d0fc0aee20c572e75f1864 SHA256 6b71311e7ad08865bda4b88c9672c8f66272e8ccd974331d628403618d5ceb29 +MD5 869c6fade7cea4b4b162b1409c677d04 files/lilo-22.7.3-makefile.patch 1894 +RMD160 ff3674d256a4df122fc095b5a2571154979fe41b files/lilo-22.7.3-makefile.patch 1894 +SHA256 6b71311e7ad08865bda4b88c9672c8f66272e8ccd974331d628403618d5ceb29 files/lilo-22.7.3-makefile.patch 1894 +AUX lilo-22.7.3-novga.patch 804 RMD160 1b2391b1f92d48c1db5623ec9b4eec34844078d6 SHA1 2bee42b35344ab5b2a63d354c61c7b44aec75627 SHA256 812da9b2afb785a0aca27fe9b0d8a06b982792d60cd6b4b6dda16c7b6a73b297 +MD5 e42ba9cd707df24649879cc297377cf9 files/lilo-22.7.3-novga.patch 804 +RMD160 1b2391b1f92d48c1db5623ec9b4eec34844078d6 files/lilo-22.7.3-novga.patch 804 +SHA256 812da9b2afb785a0aca27fe9b0d8a06b982792d60cd6b4b6dda16c7b6a73b297 files/lilo-22.7.3-novga.patch 804 AUX lilo.conf 1722 RMD160 8f4c152ae448cd4ae46c379884a2fe4adbf64d4b SHA1 75c7374359acb94955026a1f626c5355d70829cd SHA256 1cc9e4828e7b61f7c0ebf6655d7d6be3b584461308b568267f3c1bb7fb8371d0 MD5 5f2172291cc1252b30f5a60981a51ac4 files/lilo.conf 1722 RMD160 8f4c152ae448cd4ae46c379884a2fe4adbf64d4b files/lilo.conf 1722 @@ -73,6 +85,7 @@ DIST dolilo-0.3.tar.bz2 3554 RMD160 b9ae32021767b3548d6fdfe6b71d9100d81ed2ba SHA DIST dolilo-0.4.tar.bz2 3753 RMD160 e63d7d258461346620d012d8e89b22b3f969b089 SHA1 887c778c2cc603d24995a5ab58c6cdce974bd88a SHA256 812f7cb7a9c93eade7afaa8f12955723c4bdaede1c61f90162390dedfc37bd2e DIST lilo-22.7.1.src.tar.gz 429373 RMD160 7be56fb510ada6a54ae7da948efc6e342d04140c SHA1 b431bb0756e1f42c38fc4645063acaea7f2ddcc7 SHA256 7fa192588910e42d0e544967e050b15e3c32acb7fdecad53c3283cbc3560a756 DIST lilo-22.7.2.src.tar.gz 433625 RMD160 03fe32839751b3497dc9f06490dc2cd3bff6b805 SHA1 63b758d86d2242b802bce01da318f8c225eb0589 SHA256 3fae019ee67a63f8fc35aade5e7f61a1dd01a210af1b46c6df4b9862597547da +DIST lilo-22.7.3.src.tar.gz 436177 RMD160 265e5934183ed01ae74641161ac5eec28716f944 SHA1 d6de449607dfca518ca4e0d5d3be5d7d98eab0e5 SHA256 606aa55b66b6dd8baab0465b7c23aa84a48e594a13b41eb995178a1ca2651fc5 DIST lilo-22.7.src.tar.gz 428600 RMD160 76fcc2551bef7ded3d3b1c833bc76fbf1cb8c9a7 SHA1 90586882ac875fa5989e0855482df62050669aac SHA256 d6372f8823243bc0d09308477f454004ad3fdb45fdef609ddeb9648995e3c063 EBUILD lilo-22.7.1.ebuild 4930 RMD160 907fab3ebc42728a28aa9717dc4ed23fc9863141 SHA1 b382e49a58fb4da233d5428ef7045030c4c504f4 SHA256 13c6124b0cea8e0a3a6c304b7a53e2d84f969f7f0e6a5f5d4e3ee65f935abf16 MD5 0d8df5686dac4b01375279edc1e26427 lilo-22.7.1.ebuild 4930 @@ -86,6 +99,10 @@ EBUILD lilo-22.7.2-r2.ebuild 5015 RMD160 6db3592a1516f92394858a772fa86423f14b9ae MD5 011b37ad2de5e002af346b99c2c61c71 lilo-22.7.2-r2.ebuild 5015 RMD160 6db3592a1516f92394858a772fa86423f14b9aef lilo-22.7.2-r2.ebuild 5015 SHA256 ac40229b91b0f60f8ceb900363443066ee3e3e004eab5c8979b0d9ef70ade573 lilo-22.7.2-r2.ebuild 5015 +EBUILD lilo-22.7.3.ebuild 4547 RMD160 261f1eb1fd4252a3340d09d341a86d2e806307ca SHA1 46a11e31849cd1bbfc515954c12a397cfe17cbcf SHA256 05eddbaf161910d0b6db87d425849cfa025b4867252c77c06db08e4a6ba7eb20 +MD5 27276a12a0b415ecb9bc7f2452c50596 lilo-22.7.3.ebuild 4547 +RMD160 261f1eb1fd4252a3340d09d341a86d2e806307ca lilo-22.7.3.ebuild 4547 +SHA256 05eddbaf161910d0b6db87d425849cfa025b4867252c77c06db08e4a6ba7eb20 lilo-22.7.3.ebuild 4547 EBUILD lilo-22.7.ebuild 5179 RMD160 30448b86ba811587bacb8f9e88e19d5362ba2fc2 SHA1 dc651bfce8c03911d1ac24c2d004c66905490133 SHA256 7ee485dc431faeba7977d309cfd5a966509ef0df6a14578375fc07a2d7a24ca5 MD5 8b40ee8fe163769e5ac0ca24963199cb lilo-22.7.ebuild 5179 RMD160 30448b86ba811587bacb8f9e88e19d5362ba2fc2 lilo-22.7.ebuild 5179 @@ -110,10 +127,13 @@ SHA256 969fb08b4bd066d52832fb908c90cd3d98405d76a4f5b3db3f0441e1211d5a92 files/di MD5 5fe1301c27405c41c58fb991c2ec62b2 files/digest-lilo-22.7.2-r2 476 RMD160 f638b9934b99c4215d4c7d8f8b1a7bb58c078cdb files/digest-lilo-22.7.2-r2 476 SHA256 722a87fe49f606a7b7d3490634225fa2fdf16ca2b93e7c247c9da53c4500837b files/digest-lilo-22.7.2-r2 476 +MD5 90b0607f765663f3559e910794ae055c files/digest-lilo-22.7.3 476 +RMD160 f7fe400c9a7c1c0949c09c98888665492a38f646 files/digest-lilo-22.7.3 476 +SHA256 b1eeb365d3d00fe71e0612104f6561dbdb6d97a3c087f6615fd2b35a8dc2e743 files/digest-lilo-22.7.3 476 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) -iD8DBQFE/V71p5vW4rUFj5oRAsOhAJ0VYHmW5Wxoi3NUbUN8U1GhZIEPWgCgrIgP -kD7shZJwtBjWv1dC2L+/4r4= -=dffc +iD8DBQFFF9Usp5vW4rUFj5oRAqsOAJ9CeMlUs3HU5Xn6w5FS38XIxkjyIwCfVYPd +rZts13yCj8TmNPlJykvpv4c= +=HwWO -----END PGP SIGNATURE----- diff --git a/sys-boot/lilo/files/digest-lilo-22.7.3 b/sys-boot/lilo/files/digest-lilo-22.7.3 new file mode 100644 index 000000000000..480a5f8e31a9 --- /dev/null +++ b/sys-boot/lilo/files/digest-lilo-22.7.3 @@ -0,0 +1,6 @@ +MD5 08243e46598d6f457e8e4135f1fa8d52 dolilo-0.4.tar.bz2 3753 +RMD160 e63d7d258461346620d012d8e89b22b3f969b089 dolilo-0.4.tar.bz2 3753 +SHA256 812f7cb7a9c93eade7afaa8f12955723c4bdaede1c61f90162390dedfc37bd2e dolilo-0.4.tar.bz2 3753 +MD5 a3aacf90482e0c07492623042b901503 lilo-22.7.3.src.tar.gz 436177 +RMD160 265e5934183ed01ae74641161ac5eec28716f944 lilo-22.7.3.src.tar.gz 436177 +SHA256 606aa55b66b6dd8baab0465b7c23aa84a48e594a13b41eb995178a1ca2651fc5 lilo-22.7.3.src.tar.gz 436177 diff --git a/sys-boot/lilo/files/lilo-22.7.3-correct-usage-info.patch b/sys-boot/lilo/files/lilo-22.7.3-correct-usage-info.patch new file mode 100644 index 000000000000..7b26b339f93f --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.7.3-correct-usage-info.patch @@ -0,0 +1,12 @@ +--- lilo-22.7.ORIG/lilo.c 2005-05-02 01:52:16.000000000 +0100 ++++ lilo-22.7/lilo.c 2005-05-02 01:53:50.000000000 +0100 +@@ -381,7 +381,8 @@ + fprintf(errstd,"%7s%s -T help \t\t\tlist additional options\n", "", name); + fprintf(errstd,"%7s%s -X\t\t\t\tinternal compile-time options\n", "", name); + #endif /* !__MSDOS__ */ +- fprintf(errstd,"%7s%s -V [ -v ]\t\t\tversion information\n\n","",name); ++ fprintf(errstd,"%7s%s -V\t\t\t\tversion information\n","",name); ++ fprintf(errstd,"%7s%s -v\t\t\t\tverbose mode\n\n","",name); + exit(1); + } + diff --git a/sys-boot/lilo/files/lilo-22.7.3-makefile.patch b/sys-boot/lilo/files/lilo-22.7.3-makefile.patch new file mode 100644 index 000000000000..943e3c437bc0 --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.7.3-makefile.patch @@ -0,0 +1,46 @@ +diff -uNr lilo-22.7.3.ORIG/Makefile lilo-22.7.3/Makefile +--- lilo-22.7.3.ORIG/Makefile 2006-09-25 14:04:00.000000000 +0100 ++++ lilo-22.7.3/Makefile 2006-09-25 14:04:47.000000000 +0100 +@@ -68,16 +68,7 @@ + -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ + -DMDPRAID + +-# set the following if you wish LILO.COM to be installed +-DOS_DIR=/dosC/boot +-# +-#MAN_DIR=`if [ -z "$(whereis lilo | grep 'lilo.8')" ]; then \ +-# whereis lilo | sed -e "sX.* /usrX/usrX" -e "sX/man8/lilo.8.*XX" ; \ +-# elif [ -f /usr/bin/manpath ]; then \ +-# manpath | sed "s/:.*//"; else echo /usr/man; fi` +-# +-MAN_DIR=`if [ -f /usr/bin/manpath ]; then \ +- manpath | sed "s/:.*//"; else echo /usr/man; fi` ++MAN_DIR=/usr/share/man + + # set the compiler optimization level + +@@ -419,12 +410,12 @@ + # normal install, but doesn't make the diagnostic binaries + # + install: all +- if [ ! -d $$ROOT$(SBIN_DIR) ]; then mkdir $$ROOT$(SBIN_DIR); fi +- if [ ! -d $$ROOT$(CFG_DIR) ]; then mkdir $$ROOT$(CFG_DIR); fi +- if [ ! -d $$ROOT$(BOOT_DIR) ]; then mkdir $$ROOT$(BOOT_DIR); fi ++ if [ ! -d $$ROOT$(SBIN_DIR) ]; then mkdir -p $$ROOT$(SBIN_DIR); fi ++ if [ ! -d $$ROOT$(CFG_DIR) ]; then mkdir -p $$ROOT$(CFG_DIR); fi ++ if [ ! -d $$ROOT$(BOOT_DIR) ]; then mkdir -p $$ROOT$(BOOT_DIR); fi + if [ ! -d $$ROOT$(USRSBIN_DIR) ]; then \ + mkdir -p $$ROOT$(USRSBIN_DIR); fi +- if [ ! -d $$ROOT$(MAN_DIR) ]; then mkdir $$ROOT$(MAN_DIR); fi ++ if [ ! -d $$ROOT$(MAN_DIR) ]; then mkdir -p $$ROOT$(MAN_DIR); fi + if [ ! -d $$ROOT$(MAN_DIR)/man5 ]; then \ + mkdir $$ROOT$(MAN_DIR)/man5; fi + if [ ! -d $$ROOT$(MAN_DIR)/man8 ]; then \ +@@ -457,7 +448,6 @@ + rm -f $$ROOT$(BOOT_DIR)/boot.b; fi + cp mkrescue $$ROOT$(SBIN_DIR) + cp lilo $$ROOT$(SBIN_DIR) +- strip $$ROOT$(SBIN_DIR)/lilo + cp keytab-lilo.pl $$ROOT$(USRSBIN_DIR) + cp manPages/lilo.8 $$ROOT$(MAN_DIR)/man8 + cp manPages/mkrescue.8 $$ROOT$(MAN_DIR)/man8 diff --git a/sys-boot/lilo/files/lilo-22.7.3-novga.patch b/sys-boot/lilo/files/lilo-22.7.3-novga.patch new file mode 100644 index 000000000000..0b145eb29b70 --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.7.3-novga.patch @@ -0,0 +1,25 @@ +diff -uNr lilo-22.7.2.ORIG/first.S lilo-22.7.2/first.S +--- lilo-22.7.2.ORIG/first.S 2006-07-12 14:14:16.000000000 +0100 ++++ lilo-22.7.2/first.S 2006-07-12 14:14:34.000000000 +0100 +@@ -531,7 +531,8 @@ + ; display - write byte in AL to console + ; preserves all register contents + ; +-display: pusha ! make sure no register is changed ++display: ret ++ pusha ! make sure no register is changed + mov bx,#7 ! BH=0, BL=07 + mov ah,#14 + int 0x10 +diff -uNr lilo-22.7.2.ORIG/second.S lilo-22.7.2/second.S +--- lilo-22.7.2.ORIG/second.S 2006-07-12 14:14:16.000000000 +0100 ++++ lilo-22.7.2/second.S 2006-07-12 14:14:34.000000000 +0100 +@@ -2342,7 +2342,7 @@ + ;;; xor bh,bh ; display on screen + mov bx,#7 ; set color for TEXT interface + mov ah,#14 +- int 0x10 ++;; int 0x10 + dispret: + pop bx ; restore BX + ret diff --git a/sys-boot/lilo/lilo-22.7.3.ebuild b/sys-boot/lilo/lilo-22.7.3.ebuild new file mode 100644 index 000000000000..81ec234facd9 --- /dev/null +++ b/sys-boot/lilo/lilo-22.7.3.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.3.ebuild,v 1.1 2006/09/25 13:09:38 chainsaw Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +DOLILO_V="0.4" +IUSE="devmap static minimal pxeserial" + +DESCRIPTION="Standard Linux boot loader" +HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/" +DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" +MY_P=${P}.src + +SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz + ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${MY_P}.tar.gz + ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${MY_P}.tar.gz + mirror://gentoo/${DOLILO_TAR}" + +SLOT="0" +LICENSE="BSD GPL-2" +KEYWORDS="-* ~x86 ~amd64" + +RDEPEND="devmap? ( >=sys-fs/device-mapper-1.00.08 )" +DEPEND="${RDEPEND} + >=sys-devel/bin86-0.15.5" + +PROVIDE="virtual/bootloader" + +src_unpack() { + unpack ${MY_P}.tar.gz + + cd ${S} + + # Correctly document commandline options -v and -V, bug #43554 + epatch ${FILESDIR}/${P}-correct-usage-info.patch + # Install manpages to correct location, do not rely on incorrect manpath output, bug #117135 + # Do not strip the main binary, it upsets portage, bug #140210 + epatch ${FILESDIR}/${P}-makefile.patch + + # this patch is needed when booting PXE and the device you're using + # emulates vga console via serial console. + # IE.. B.B.o.o.o.o.t.t.i.i.n.n.g.g....l.l.i.i.n.n.u.u.x.x and stair stepping. + use pxeserial && epatch ${FILESDIR}/${P}-novga.patch + + unpack ${DOLILO_TAR} +} + +src_compile() { + # lilo needs this. bug 140209 + export LC_ALL=C + + # hardened automatic PIC plus PIE building should be suppressed + # because of assembler instructions that cannot be compiled PIC + HARDENED_CFLAGS="`test-flags-CC -fno-pic -nopie`" + + # we explicitly prevent the custom CFLAGS for stability reasons + if use static; then + emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo.static || die + mv lilo.static lilo || die + else + emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo || die + fi +} + +src_install() { + keepdir /boot + make ROOT=${D} install || die + + if use !minimal; then + into / + dosbin ${S}/dolilo/dolilo + + into /usr + dosbin keytab-lilo.pl + + insinto /etc + newins ${FILESDIR}/lilo.conf lilo.conf.example + + insinto /etc/conf.d + newins ${S}/dolilo/dolilo.conf.d dolilo.example + + doman manPages/*.[5-8] + dodoc CHANGES COPYING INCOMPAT README* + docinto samples ; dodoc sample/* + fi +} + +# Check whether LILO is installed +# This function is from /usr/sbin/mkboot from debianutils, with copyright: +# +# Debian GNU/Linux +# Copyright 1996-1997 Guy Maor <maor@debian.org> +# +# Modified for Gentoo for use with the lilo ebuild by: +# Martin Schlemmer <azarah@gentoo.org> (16 Mar 2003) +# +lilocheck () { + local bootpart= + local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")" + + echo + einfon "Checking for LILO ..." + + if [ "$(whoami)" != "root" ] + then + echo; echo + eerror "Only root can check for LILO!" + return 1 + fi + + if [ -z "${rootpart}" ] + then + echo; echo + eerror "Could not determine root partition!" + return 1 + fi + + if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ] + then + echo " No" + return 1 + fi + + bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" /etc/lilo.conf)" + + if [ -z "${bootpart}" ] + then + # lilo defaults to current root when 'boot=' is not present + bootpart="${rootpart}" + fi + + if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO' + then + echo; echo + ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}" + ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand." + return 1 + fi + + echo " Yes, on ${bootpart}" + + return 0 +} + + +pkg_postinst() { + if [ ! -e ${ROOT}/boot/boot.b -a ! -L ${ROOT}/boot/boot.b ] + then + [ -f "${ROOT}/boot/boot-menu.b" ] && \ + ln -snf boot-menu.b ${ROOT}/boot/boot.b + fi + + if [ "${ROOT}" = "/" ] && use !minimal; + then + if lilocheck + then + einfo "Running DOLILO to complete the install ..." + # do not redirect to /dev/null because it may display some input + # prompt + /sbin/dolilo + if [ "$?" -ne 0 ] + then + echo + ewarn "Running /sbin/dolilo failed! Please check what the problem is" + ewarn "before your next reboot." + + ebeep 5 + epause 5 + fi + fi + echo + fi + if use !minimal; then + echo + einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that" + einfo "handles mounting and unmounting /boot for you. It can do more then" + einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential." + ebeep 5 + epause 3 + echo + fi +} |