diff options
| -rw-r--r-- | sys-boot/lilo/ChangeLog | 13 | ||||
| -rw-r--r-- | sys-boot/lilo/Manifest | 9 | ||||
| -rw-r--r-- | sys-boot/lilo/files/digest-lilo-22.6.1-r1 | 2 | ||||
| -rw-r--r-- | sys-boot/lilo/files/lilo-22.6.1-novga.patch | 34 | ||||
| -rw-r--r-- | sys-boot/lilo/lilo-22.6.1-r1.ebuild | 200 | ||||
| -rw-r--r-- | sys-boot/lilo/lilo-22.6.1.ebuild | 4 |
6 files changed, 255 insertions, 7 deletions
diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog index 7f34cea35775..d4c964c1797e 100644 --- a/sys-boot/lilo/ChangeLog +++ b/sys-boot/lilo/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-boot/lilo -# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.29 2004/12/17 14:31:02 chainsaw Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.30 2005/02/26 15:10:54 chainsaw Exp $ + +*lilo-22.6.1-r1 (26 Feb 2005) + + 26 Feb 2005; Tony Vroon <chainsaw@gentoo.org> + +files/lilo-22.6.1-novga.patch, +lilo-22.6.1-r1.ebuild: + Embedded-friendly version with a minimal USE-flag which disables + installation of dolilo and automatic LILO bootsector upgrading. Also + introduces a patch to avoid character echo's and staircasing on PXE serial + consoles with VGA emulation. 17 Dec 2004; Tony Vroon <chainsaw@gentoo.org> -lilo-22.6-r1.ebuild, lilo-22.6.1.ebuild: diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index 51a4b9567a94..8bd327e28085 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -1,8 +1,11 @@ +MD5 1a9dfe74814b42f4d779dd35ae3a73aa lilo-22.6.1-r1.ebuild 5017 +MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254 MD5 9b045373ccba3534dc69e5dd981fa953 lilo-22.6.1.ebuild 4775 MD5 94847d12378c68e50148c997b9b33748 ChangeLog 2671 -MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254 -MD5 42faa8a84fae547fe181da0ad7b67b04 files/lilo-22.6.1-devmapper_gentoo.patch 11826 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.6.1-create-install-dirs.patch 970 +MD5 42faa8a84fae547fe181da0ad7b67b04 files/lilo-22.6.1-devmapper_gentoo.patch 11826 +MD5 fff6910b2180128e251d89f31221b683 files/digest-lilo-22.6.1-r1 128 MD5 ab2657bc635313522eb791e30b1166ef files/lilo-22.6.1-correct-usage-info.patch 683 -MD5 fff6910b2180128e251d89f31221b683 files/digest-lilo-22.6.1 128 +MD5 78f9720430dac90363e7b5120a262a3a files/lilo-22.6.1-novga.patch 936 MD5 5f2172291cc1252b30f5a60981a51ac4 files/lilo.conf 1722 +MD5 fff6910b2180128e251d89f31221b683 files/digest-lilo-22.6.1 128 diff --git a/sys-boot/lilo/files/digest-lilo-22.6.1-r1 b/sys-boot/lilo/files/digest-lilo-22.6.1-r1 new file mode 100644 index 000000000000..edf8246ca993 --- /dev/null +++ b/sys-boot/lilo/files/digest-lilo-22.6.1-r1 @@ -0,0 +1,2 @@ +MD5 18473e10859767b8af5d08aa7d9fe1e7 lilo-22.6.1.src.tar.gz 422818 +MD5 88acd6cac12da7e6da02615ba1ca6ddf dolilo-0.3.tar.bz2 3554 diff --git a/sys-boot/lilo/files/lilo-22.6.1-novga.patch b/sys-boot/lilo/files/lilo-22.6.1-novga.patch new file mode 100644 index 000000000000..108b41343d18 --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.6.1-novga.patch @@ -0,0 +1,34 @@ +diff -u lilo-22.6.1/first.S lilo-22.6.1.novga/first.S +--- lilo-22.6.1/first.S 2004-08-31 12:39:25.000000000 -0700 ++++ lilo-22.6.1.novga/first.S 2004-12-06 14:47:22.000000000 -0800 +@@ -522,7 +522,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 -u lilo-22.6.1/second.S lilo-22.6.1.novga/second.S +--- lilo-22.6.1/second.S 2004-11-15 18:59:35.000000000 -0800 ++++ lilo-22.6.1.novga/second.S 2004-12-06 14:49:03.000000000 -0800 +@@ -2155,7 +2155,7 @@ + + ! Display one character on the console + +-display: ++display: + push bx ! save BX + + #ifndef LCF_NOSERIAL +@@ -2219,7 +2219,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.6.1-r1.ebuild b/sys-boot/lilo/lilo-22.6.1-r1.ebuild new file mode 100644 index 000000000000..92fe14760d4f --- /dev/null +++ b/sys-boot/lilo/lilo-22.6.1-r1.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6.1-r1.ebuild,v 1.1 2005/02/26 15:10:54 chainsaw Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +DOLILO_V="0.3" +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" + +RDEPEND="devmap? ( >=sys-libs/device-mapper-1.00.08 )" +DEPEND="${RDEPEND} + >=sys-devel/bin86-0.15.5" + +PROVIDE="virtual/bootloader" + +src_unpack() { + einfo "If you want to use lilo with device mapper, please enable the" + einfo "\"devmap\" USE flag." + + unpack ${MY_P}.tar.gz + + # Do not try and build the dos crap. + sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile + + # The bootlogo patch from SuSE linux, which was originally in + # here, has been dropped because it's no longer compatible + # with lilo since the 22.5.x series. + # Quequero has done a good attempt to port the patch in bug + # #19397, but unfortunately that breaks the timeout at boot. + # If you can overcome these problems, a patch is very welcome. + + if use devmap; then + # devmapper-patch (boot on evms/lvm2) + cd ${S}; epatch ${FILESDIR}/${P}-devmapper_gentoo.patch + fi + + cd ${S} + + # Fix creating install dirs, bug #39405 + epatch ${FILESDIR}/${P}-create-install-dirs.patch + # Correctly document commandline options -v and -V, bug #43554 + epatch ${FILESDIR}/${P}-correct-usage-info.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 novga && epatch ${FILESDIR}/lilo-22.6.1-novga.patch + + # Get the manpage path right + sed -i -e s,usr/man,usr/share/man,g ${S}/Makefile + + unpack ${DOLILO_TAR} +} + +src_compile() { + # hardened automatic PIC plus PIE building should be suppressed + # because of assembler instructions that cannot be compiled PIC + HARDENED_CFLAGS="`test_flag -fno-pic` `test_flag -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="$(rdev 2> /dev/null | cut -d ' ' -f 1 2> /dev/null)" + + 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 +} diff --git a/sys-boot/lilo/lilo-22.6.1.ebuild b/sys-boot/lilo/lilo-22.6.1.ebuild index 8348b3d86312..fb2704ec308a 100644 --- a/sys-boot/lilo/lilo-22.6.1.ebuild +++ b/sys-boot/lilo/lilo-22.6.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6.1.ebuild,v 1.2 2004/12/17 14:31:02 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6.1.ebuild,v 1.3 2005/02/26 15:10:54 chainsaw Exp $ inherit eutils flag-o-matic toolchain-funcs |