Introduced device-mapper local USE flag.

Package-Manager: portage-2.1.2.5

5 files changed, 229 insertions, 9 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index ee09c50ddc92..2ca5869193fa 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.49 2007/04/21 20:54:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.50 2007/04/28 22:03:26 ulm Exp $
+
+*lilo-22.8-r1 (28 Apr 2007)
+
+  28 Apr 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/lilo-22.8-nodevmapper.patch, +lilo-22.8-r1.ebuild:
+  Don't detect libdevmapper automatically but control via new USE flag
+  device-mapper. Resolves bug #172167.
 
   21 Apr 2007; Tony Vroon <chainsaw@gentoo.org> lilo-22.7.3-r1.ebuild,
   lilo-22.8.ebuild:
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 8ff7d7008eef..3a5def12fea8 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -29,6 +29,10 @@ AUX lilo-22.8-makefile.patch 1776 RMD160 129e056f3592e4e8276acfe03106c3ae9e7ddff
 MD5 8edbaa01e793ce03ccc7f1ae01a9c26c files/lilo-22.8-makefile.patch 1776
 RMD160 129e056f3592e4e8276acfe03106c3ae9e7ddfff files/lilo-22.8-makefile.patch 1776
 SHA256 4e95ead9648613a4682445f161818e6af875386aaa24f33bdb87c4c3d7cf38d7 files/lilo-22.8-makefile.patch 1776
+AUX lilo-22.8-nodevmapper.patch 437 RMD160 1c70c8d9b107f0210cbc90e6c005d0a079de040c SHA1 fa6cae8448c13bd10c68a4ee79bb753f2f8ec4aa SHA256 0d9c747650db3afd65a9dc8467af4262073f2a66c9f70490298b37e3d9f9f1a6
+MD5 4f6c10f642037251c8a3d32428ed7e71 files/lilo-22.8-nodevmapper.patch 437
+RMD160 1c70c8d9b107f0210cbc90e6c005d0a079de040c files/lilo-22.8-nodevmapper.patch 437
+SHA256 0d9c747650db3afd65a9dc8467af4262073f2a66c9f70490298b37e3d9f9f1a6 files/lilo-22.8-nodevmapper.patch 437
 AUX lilo-22.8-novga.patch 831 RMD160 b48d96a16e2be1e4c26372d27fd41a3830293947 SHA1 6b17310e2c71c605a7a2e816ac2a02b326ee6d28 SHA256 5ff92c00ce2624a070ebb616ab2efede5460cdd229d0e9bc97e4ddc65daa1e8a
 MD5 5ce946672cf0e1ed0853c936fa710d08 files/lilo-22.8-novga.patch 831
 RMD160 b48d96a16e2be1e4c26372d27fd41a3830293947 files/lilo-22.8-novga.patch 831
@@ -44,14 +48,18 @@ EBUILD lilo-22.7.3-r1.ebuild 4647 RMD160 08bafc763b68ebabc7654296a3d971311495901
 MD5 52e7d624f7936957e935901e9c9aeaf8 lilo-22.7.3-r1.ebuild 4647
 RMD160 08bafc763b68ebabc7654296a3d971311495901d lilo-22.7.3-r1.ebuild 4647
 SHA256 3b6b21e5feee6142c193bffbf16c9085d79e1cc8392a4e773f1de9d8d00b23dc lilo-22.7.3-r1.ebuild 4647
+EBUILD lilo-22.8-r1.ebuild 4621 RMD160 11250e8f2f4b882da0625381b719def20b21127c SHA1 c02ed7492183bf93bf34151954e8bed772af0405 SHA256 ef25308266f040689069be7b8a0e558ea5bed3e06f76c642686ef8f74a62f092
+MD5 f56485cdb4bf9e079024715877557397 lilo-22.8-r1.ebuild 4621
+RMD160 11250e8f2f4b882da0625381b719def20b21127c lilo-22.8-r1.ebuild 4621
+SHA256 ef25308266f040689069be7b8a0e558ea5bed3e06f76c642686ef8f74a62f092 lilo-22.8-r1.ebuild 4621
 EBUILD lilo-22.8.ebuild 4494 RMD160 3ab68a6cec2c987e780ad7b75aaeb3aab61f08b2 SHA1 acf518849dff4975b3b14102dcfc406fe200faf8 SHA256 5ac9d731d69279a8f7544d513159a7415a0d3485e3e362666d67b50caeff4cd1
 MD5 9dc80491e05028c391ce66b88c195053 lilo-22.8.ebuild 4494
 RMD160 3ab68a6cec2c987e780ad7b75aaeb3aab61f08b2 lilo-22.8.ebuild 4494
 SHA256 5ac9d731d69279a8f7544d513159a7415a0d3485e3e362666d67b50caeff4cd1 lilo-22.8.ebuild 4494
-MISC ChangeLog 8990 RMD160 3586cece6a698ae3e47a01ad0ea58af887ef05f4 SHA1 aed1e44a4e6307df904506529d8cc7d0ac719a00 SHA256 8e82804416436eb4cbecbfca972d51a41d505338a259caa501e00ce8b201953b
-MD5 26c53f529897938ce61c0f784a826e51 ChangeLog 8990
-RMD160 3586cece6a698ae3e47a01ad0ea58af887ef05f4 ChangeLog 8990
-SHA256 8e82804416436eb4cbecbfca972d51a41d505338a259caa501e00ce8b201953b ChangeLog 8990
+MISC ChangeLog 9232 RMD160 a2ceb82daebc89cd301c9e2c7200e6682601183a SHA1 49c56d014f5d0cd5a817a683bc5c5f68b900b588 SHA256 0fc45d355a4ce3d6842c0ba45211c71c713981c2023407d357d850b453c9dc8a
+MD5 6dbdf80127bc786d09a8acd45b877267 ChangeLog 9232
+RMD160 a2ceb82daebc89cd301c9e2c7200e6682601183a ChangeLog 9232
+SHA256 0fc45d355a4ce3d6842c0ba45211c71c713981c2023407d357d850b453c9dc8a ChangeLog 9232
 MISC metadata.xml 254 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a SHA1 de5f6d0faac7d5f11daa399f9e875c30cac2ce64 SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a metadata.xml 254
@@ -62,10 +70,13 @@ SHA256 b1eeb365d3d00fe71e0612104f6561dbdb6d97a3c087f6615fd2b35a8dc2e743 files/di
 MD5 c933257a227f8163d697a9f442466390 files/digest-lilo-22.8 470
 RMD160 6cfde3069f672493ee90182e8ed55702bfa97251 files/digest-lilo-22.8 470
 SHA256 e8ae6397cb7057ec977679a334c48c70d9f2c73d07c31966ab84a2d5e37f71cd files/digest-lilo-22.8 470
+MD5 c933257a227f8163d697a9f442466390 files/digest-lilo-22.8-r1 470
+RMD160 6cfde3069f672493ee90182e8ed55702bfa97251 files/digest-lilo-22.8-r1 470
+SHA256 e8ae6397cb7057ec977679a334c48c70d9f2c73d07c31966ab84a2d5e37f71cd files/digest-lilo-22.8-r1 470
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGKnmIp5vW4rUFj5oRAm8XAJ0fsptC1qqpwJw8+Yd3egjYrBM46QCcCzl6
-NgvvCzj9hdRjHxUQ9zVf7ZQ=
-=GRBB
+iD8DBQFGM8UvOeoy/oIi7uwRAjSXAKCJX9eJ3ogWcbjLjA/Qop0CahdwFgCfakeT
+mVkzd555b2TGKsSqor7UpDI=
+=UDBY
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/lilo/files/digest-lilo-22.8-r1 b/sys-boot/lilo/files/digest-lilo-22.8-r1
new file mode 100644
index 000000000000..84eb7c6deec8
--- /dev/null
+++ b/sys-boot/lilo/files/digest-lilo-22.8-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 72765f2aafd20e23ecf07ebd22baeec7 lilo-22.8.src.tar.gz 437555
+RMD160 b452f4821cbc917b29cf168587652a6f1efd33e1 lilo-22.8.src.tar.gz 437555
+SHA256 bad5907c212c0b2b15de5e852787a1ad2129a702f113b26345eec1c917c4edcb lilo-22.8.src.tar.gz 437555
diff --git a/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch b/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch
new file mode 100644
index 000000000000..f81cbfe92ef5
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch
@@ -0,0 +1,13 @@
+--- Makefile~	2007-04-28 22:04:23.000000000 +0200
++++ Makefile	2007-04-28 22:21:46.000000000 +0200
+@@ -91,8 +91,8 @@
+   sed 's/-D/-DLCF_/g'`
+ LILO=-DLILO=0xbb920890
+ KVER=`if [ -f /usr/include/linux/version.h ]; then echo -DHAS_VERSION_H; fi`
+-HDM=`if [ -f /usr/include/libdevmapper.h ]; then echo -DHAS_LIBDEVMAPPER_H; fi`
+-DEVMAPPER=`if [ -f /usr/include/libdevmapper.h ]; then echo "-ldevmapper"; fi`
++HDM=
++DEVMAPPER=
+ 
+ TMP=_TmP_
+ 
diff --git a/sys-boot/lilo/lilo-22.8-r1.ebuild b/sys-boot/lilo/lilo-22.8-r1.ebuild
new file mode 100644
index 000000000000..7ddac71cc628
--- /dev/null
+++ b/sys-boot/lilo/lilo-22.8-r1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.8-r1.ebuild,v 1.1 2007/04/28 22:03:26 ulm Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DOLILO_V="0.4"
+IUSE="static minimal pxeserial device-mapper"
+
+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"
+
+DEPEND=">=sys-devel/bin86-0.15.5
+	device-mapper? ( >=sys-fs/device-mapper-1.02.12 )"
+
+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
+	# Do not install diag1.img, bug #149887
+	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
+	use device-mapper || epatch ${FILESDIR}/${P}-nodevmapper.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
+
+		newconfd ${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
+}