fixes Bug 48243; added devmap USE flag

4 files changed, 200 insertions, 1 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 404497c077d5..a3402db5ac6d 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.7 2004/04/21 02:13:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.8 2004/05/09 20:58:10 lordvan Exp $
+
+*lilo-22.5.8-r3 (09 May 2004)
+
+  09 May 2004; Thomas Raschbacher <lordvan@gentoo.org> +lilo-22.5.8-r3.ebuild:
+  new revision - added devmap USE for device-mapper patch & dep
+  fixes Bug #48243; Thanks to Solar and Andrej Kacian.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   lilo-22.5.8-r1.ebuild, lilo-22.5.8-r2.ebuild:
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 622f9874283c..ee8347be3118 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,8 +1,10 @@
 MD5 6f9d0477c845e1a0541d4550126e16df lilo-22.5.8-r2.ebuild 4638
+MD5 d69561847871f4994234ce13aa93dfdc lilo-22.5.8-r3.ebuild~ 4707
 MD5 0f4187f805b8c78c9a7b3da37c19ba6d lilo-22.5.7.2.ebuild 3924
 MD5 2d537b64b8df51695e62850926248258 lilo-22.5.8-r1.ebuild 4507
 MD5 e5c7a36acafab7b3728c01457140e82a lilo-22.5.1.ebuild 4286
 MD5 00a0ca339c35dfa56cdbc374a8adedb1 lilo-22.5.6-r2.ebuild 3190
+MD5 595e3c1fe5f527cb177e389979de91d4 lilo-22.5.8-r3.ebuild 4701
 MD5 f1ac83767a893165a9b24b808dda2cc4 lilo-22.5.8.ebuild 3991
 MD5 2bd306b9cae8221dff9692c1ccc81b89 ChangeLog 7544
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
@@ -12,6 +14,7 @@ MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8 63
 MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6-r2 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r1 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r2 63
+MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r3 63
 MD5 89d3f49772308bc3fb195f51c9ff1035 files/digest-lilo-22.5.7.2 65
 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.5.8-create-install-dirs.patch 970
 MD5 90ff63638cb8b46b9e6f3c5231bd464e files/lilo.conf 1719
diff --git a/sys-boot/lilo/files/digest-lilo-22.5.8-r3 b/sys-boot/lilo/files/digest-lilo-22.5.8-r3
new file mode 100644
index 000000000000..c77f9da7dc05
--- /dev/null
+++ b/sys-boot/lilo/files/digest-lilo-22.5.8-r3
@@ -0,0 +1 @@
+MD5 3f7a440d198af6715aa3e5b7310e08ef lilo-22.5.8.tar.gz 412078
diff --git a/sys-boot/lilo/lilo-22.5.8-r3.ebuild b/sys-boot/lilo/lilo-22.5.8-r3.ebuild
new file mode 100644
index 000000000000..f3d11e85e094
--- /dev/null
+++ b/sys-boot/lilo/lilo-22.5.8-r3.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.8-r3.ebuild,v 1.1 2004/05/09 20:58:10 lordvan Exp $
+
+inherit mount-boot eutils flag-o-matic
+
+IUSE="devmap"
+
+DESCRIPTION="Standard Linux boot loader"
+HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/"
+SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${P}.tar.gz
+	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"
+
+SLOT="0"
+LICENSE="BSD GPL-2"
+KEYWORDS="-* ~x86"
+
+DEPEND=">=sys-apps/sed-4
+	dev-lang/nasm
+	>=sys-devel/bin86-0.15.5
+	devmap? (>=sys-libs/device-mapper-1.00.08)"
+
+PROVIDE="virtual/bootloader"
+
+src_unpack() {
+	einfo
+	einfo "If you want to use lilo with device mapper, please enable the"
+	einfo "\"devmap\" USE flag."
+	einfo
+
+	unpack ${P}.tar.gz
+
+	# Do not try and build the dos crap.
+	sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile
+
+	# 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 <quequerp@bitchx.it>
+	#
+#	cd ${S}; epatch ${FILESDIR}/${P}-animated-menu.patch
+
+	if [ `use devmap` ]; then
+		# devmapper-patch (boot on evms/lvm2)
+		cd ${S}; epatch ${FILESDIR}/${P}-devmapper_gentoo.patch
+	fi
+
+	# Fixup things for glibc-2.3.3 (and later CVS versions of 2.3.2)
+	cd ${S}; epatch ${FILESDIR}/${PN}-glibc233.patch
+	# Fix building against 2.6 headers
+	cd ${S}; epatch ${FILESDIR}/${P}.lvm.2-6headers.patch
+	# Fix creating install dirs, bug #39405
+	cd ${S}; epatch ${FILESDIR}/${P}-create-install-dirs.patch
+}
+
+src_compile() {
+	# add the hardened-gcc compiler flag for building its assembler parts ;-)
+	if has_version 'sys-devel/hardened-gcc'
+	then
+		export CC="${CC:=gcc} -yet_exec"
+		find ${W} -type f -name "Makefile" -exec sed -i "s:CC=cc:CC=${CC}:" {} \;
+	fi
+
+	# Fixes borkage with hardened gccs and people who have -fPIC, etc in their specs.
+	has_pic && CC="${CC} `test_flag -nopie` `test_flag -yet_exec`"
+
+	# Do not use custom CFLAGS for stability reasons
+	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 <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="$(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
+}
+