Update 22.7 branch patches & dolilo as 22.7.1 and up can be problematic on LVM2.

Package-Manager: portage-2.1.2_pre1

5 files changed, 240 insertions, 1 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 0f80451f2ad1..fd4e4e23962d 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.41 2006/09/05 11:26:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.42 2006/09/25 14:30:56 chainsaw Exp $
+
+*lilo-22.7-r1 (25 Sep 2006)
+
+  25 Sep 2006; Tony Vroon <chainsaw@gentoo.org>
+  +files/lilo-22.7-install-nostrip.patch, +files/lilo-22.7-manpath.patch,
+  +lilo-22.7-r1.ebuild, -lilo-22.7.2-r1.ebuild:
+  Feed back patches to 22.7 branch as 22.7.1 and up
+  do not always work correctly on LVM2 systems. Also
+  use the new dolilo 0.4 here.
+  Remove obsolete 22.7.2 branch ebuild.
+
+*lilo-22.7.3 (25 Sep 2006)
+
+  25 Sep 2006; Tony Vroon <chainsaw@gentoo.org>
+  +files/lilo-22.7.3-correct-usage-info.patch, +files/lilo-22.7.3-makefile.patch,
+  +files/lilo-22.7.3-novga.patch, +lilo-22.7.3.ebuild:
+  Version bump. Remove devmap from USE & DEPEND as the patch is accepted upstream.
 
 *lilo-22.7.2-r2 (05 Sep 2006)
 
diff --git a/sys-boot/lilo/files/digest-lilo-22.7-r1 b/sys-boot/lilo/files/digest-lilo-22.7-r1
new file mode 100644
index 000000000000..6971dbd0002e
--- /dev/null
+++ b/sys-boot/lilo/files/digest-lilo-22.7-r1
@@ -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 565cda4cd5e7c740403ed91e0bdf15f6 lilo-22.7.src.tar.gz 428600
+RMD160 76fcc2551bef7ded3d3b1c833bc76fbf1cb8c9a7 lilo-22.7.src.tar.gz 428600
+SHA256 d6372f8823243bc0d09308477f454004ad3fdb45fdef609ddeb9648995e3c063 lilo-22.7.src.tar.gz 428600
diff --git a/sys-boot/lilo/files/lilo-22.7-install-nostrip.patch b/sys-boot/lilo/files/lilo-22.7-install-nostrip.patch
new file mode 100644
index 000000000000..b8d9f2dc5a9b
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-22.7-install-nostrip.patch
@@ -0,0 +1,10 @@
+--- lilo-22.7.2/Makefile~	2006-07-13 15:10:06.000000000 +0200
++++ lilo-22.7.2/Makefile	2006-07-13 15:12:47.000000000 +0200
+@@ -439,7 +439,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-manpath.patch b/sys-boot/lilo/files/lilo-22.7-manpath.patch
new file mode 100644
index 000000000000..7860a997680e
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-22.7-manpath.patch
@@ -0,0 +1,12 @@
+--- lilo-22.7.1/Makefile.orig	2006-01-07 13:19:53.000000000 +0000
++++ lilo-22.7.1/Makefile	2006-01-07 13:20:35.000000000 +0000
+@@ -81,8 +81,7 @@
+ #	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
+ BUILTIN=1
+ 
+ PCONFIG=$(KVER) $(LILO) `( if [ -r $$ROOT/etc/lilo.defines ]; then \
diff --git a/sys-boot/lilo/lilo-22.7-r1.ebuild b/sys-boot/lilo/lilo-22.7-r1.ebuild
new file mode 100644
index 000000000000..38e35ab2bde8
--- /dev/null
+++ b/sys-boot/lilo/lilo-22.7-r1.ebuild
@@ -0,0 +1,194 @@
+# 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-r1.ebuild,v 1.1 2006/09/25 14:30:56 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() {
+	einfo "If you want to use lilo with device mapper, please enable the"
+	einfo "\"devmap\" USE flag."
+
+	unpack ${MY_P}.tar.gz
+
+	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
+	# Install manpages to correct location, do not rely on incorrect manpath output, bug #117135
+	epatch ${FILESDIR}/${P}-manpath.patch
+	# Do not strip the main binary, it upsets portage, bug #140210
+	epatch ${FILESDIR}/${P}-install-nostrip.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
+}