From 32469f07761ca7f0ba5db85d515ab72253581e8f Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Mon, 1 Sep 2003 19:25:08 +0000 Subject: update, bug #27141 --- sys-apps/lilo/ChangeLog | 7 +- sys-apps/lilo/Manifest | 5 +- sys-apps/lilo/files/digest-lilo-22.5.7.2 | 1 + sys-apps/lilo/lilo-22.5.7.2.ebuild | 159 +++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+), 4 deletions(-) create mode 100644 sys-apps/lilo/files/digest-lilo-22.5.7.2 create mode 100644 sys-apps/lilo/lilo-22.5.7.2.ebuild (limited to 'sys-apps') diff --git a/sys-apps/lilo/ChangeLog b/sys-apps/lilo/ChangeLog index b80a085aeeaf..4d34a4ab8e5f 100644 --- a/sys-apps/lilo/ChangeLog +++ b/sys-apps/lilo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/lilo # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.31 2003/08/05 19:52:09 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.32 2003/09/01 19:24:55 azarah Exp $ + +*lilo-22.5.7.2 (01 Sep 2003) + + 01 Sep 2003; Martin Schlemmer lilo-22.5.7.2.ebuild: + Update, closes bug #27141. *lilo-22.5.1 (05 Aug 2003) diff --git a/sys-apps/lilo/Manifest b/sys-apps/lilo/Manifest index 633e61853765..f1b6eb552f25 100644 --- a/sys-apps/lilo/Manifest +++ b/sys-apps/lilo/Manifest @@ -1,12 +1,11 @@ -MD5 ddb1e4a5ccb184cb66d2251d5fca73f1 lilo-22.5.7.2.ebuild 3840 +MD5 75ae91bbb281625061f956b3dbfc2285 lilo-22.5.7.2.ebuild 3857 MD5 9d48349e4847a7aa2a6824848c57e8f2 lilo-22.3.3-r1.ebuild 1998 MD5 01bd0c419e2f78240949543992494dc8 lilo-22.5.6-r2.ebuild 3540 -MD5 16de85795a164416d7b783c42e54c4b3 ChangeLog 5377 +MD5 f9148565cdc62ccbd54e867446fc05f3 ChangeLog 5511 MD5 7dd6ff54cf104acb2bf33b4c22b85460 lilo-22.3.4.ebuild 2003 MD5 a0c025ab9651ddaf0f1dc593a48df94a lilo-22.1-r3.ebuild 1582 MD5 1a1174afd8e5eb548f8370206ff91e8b lilo-22.5.1.ebuild 4523 MD5 f9f89e2d601b6c9f6acb95ce00759c78 lilo-22.5.6-r3.ebuild 3826 -MD5 c6b44fa14824c7aff22b78990c36b380 .lilo-22.5.7.2.ebuild.swp 20480 MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6-r2 63 MD5 e49971bcdc078d20a99ef4359d1fe78c files/lilo.conf 1718 MD5 ca44cc6ec0aecfe30c49c455f74aacec files/lilo-22.5.6-glibc233.patch 640 diff --git a/sys-apps/lilo/files/digest-lilo-22.5.7.2 b/sys-apps/lilo/files/digest-lilo-22.5.7.2 new file mode 100644 index 000000000000..08d2fc4c8d86 --- /dev/null +++ b/sys-apps/lilo/files/digest-lilo-22.5.7.2 @@ -0,0 +1 @@ +MD5 01117bffb9f452796d44ab9c7620901a lilo-22.5.7.2.tar.gz 410234 diff --git a/sys-apps/lilo/lilo-22.5.7.2.ebuild b/sys-apps/lilo/lilo-22.5.7.2.ebuild new file mode 100644 index 000000000000..e066075c94ee --- /dev/null +++ b/sys-apps/lilo/lilo-22.5.7.2.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.7.2.ebuild,v 1.1 2003/09/01 19:24:55 azarah Exp $ + +inherit mount-boot eutils + +S="${WORKDIR}/${P}" +DESCRIPTION="Standard Linux boot loader" +SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${P}.tar.gz + ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${P}.tar.gz" +# mirror://gentoo/${P}-gentoo.diff.bz2" +HOMEPAGE="http://brun.dyndns.org/pub/linux/lilo/" + +SLOT="0" +LICENSE="BSD GPL-2" +KEYWORDS="-* ~x86" + +DEPEND="dev-lang/nasm + >=sys-devel/bin86-0.15.5" + +PROVIDE="virtual/bootloader" + + +src_unpack() { + unpack ${P}.tar.gz + + # This bootlogo patch is borrowed from SuSE Linux. + # You should see Raphaël Quinet's (quinet@gamers.org) website, + # http://www.gamers.org/~quinet/lilo/index.html + # + # Update for 22.5 by Quequero (bug #19397): + # + # I've adapted and edited this patch from and older version + # For problems email me. + # Quequero + # +# cd ${S}; epatch ${FILESDIR}/${P}-animated-menu.patch + + # Fixup things for glibc-2.3.3 (and later CVS versions of 2.3.2) + cd ${S}; epatch ${FILESDIR}/${PN}-22.5.6-glibc233.patch +} + +src_compile() { + emake CC="${CC:=gcc}" lilo || die +} + +src_install() { + keepdir /boot + make ROOT=${D} install || die + into /usr + dosbin keytab-lilo.pl + + insinto /etc + newins ${FILESDIR}/lilo.conf lilo.conf.example + + doman manPages/*.[5-8] + dodoc CHANGES COPYING INCOMPAT README* + docinto samples ; dodoc sample/* +} + +pkg_preinst() { + mount-boot_mount_boot_partition +} + +# Check whether LILO is installed +# This function is from /usr/sbin/mkboot from debianutils, with copyright: +# +# Debian GNU/Linux +# Copyright 1996-1997 Guy Maor +# +# Modified for Gentoo for use with the lilo ebuild by: +# Martin Schlemmer (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="$(perl -ne 'print $1 if /^\s*boot\s*=\s*(\S*)/' /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}" = "/" ] + then + if lilocheck + then + einfo "Running LILO to complete the install ..." + # do not redirect to /dev/null because it may display some input + # prompt + /sbin/lilo + if [ "$?" -ne 0 ] + then + echo + ewarn "Running /sbin/lilo failed! Please check what the problem is" + ewarn "before your next reboot." + + echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 + echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 + sleep 5 + fi + fi + echo + fi + + echo + einfo "Please note that all the loader files (/boot/*.b) is now linked" + einfo "into LILO, and thus no longer installed." + echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 + sleep 3 + echo +} + -- cgit v1.2.3-65-gdbad