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

(Portage version: 2.1.2_pre1)
 (Signed Manifest commit)

3 files changed, 22 insertions, 216 deletions

diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 0e42f2fed730..5ec946c01d26 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -13,6 +13,14 @@ AUX lilo-22.7-devmapper_gentoo.patch 12072 RMD160 ce0e48e693c33ddbcac175f9cd0708
 MD5 c3e5c4bfabecddb7a57c3cdce9e21c3a files/lilo-22.7-devmapper_gentoo.patch 12072
 RMD160 ce0e48e693c33ddbcac175f9cd0708a8c249eb9e files/lilo-22.7-devmapper_gentoo.patch 12072
 SHA256 25ae7d3da0301bc5ee7cc40ac8db836d67b2b4611f8ec061267ced933cd63397 files/lilo-22.7-devmapper_gentoo.patch 12072
+AUX lilo-22.7-install-nostrip.patch 404 RMD160 ae3171720b836099d4551699fed1c7313e256cf3 SHA1 8d75cf944cd5ef6e8c0621c79c059a7992eea09b SHA256 4c155d0e99c2b392e020f365ef29a537aeee666b2936dccce45cbbf068b39c3c
+MD5 0fcf055d223be459d137aff98d933591 files/lilo-22.7-install-nostrip.patch 404
+RMD160 ae3171720b836099d4551699fed1c7313e256cf3 files/lilo-22.7-install-nostrip.patch 404
+SHA256 4c155d0e99c2b392e020f365ef29a537aeee666b2936dccce45cbbf068b39c3c files/lilo-22.7-install-nostrip.patch 404
+AUX lilo-22.7-manpath.patch 444 RMD160 8bdbb45e5fe7b6c9249d54657978b59190eba104 SHA1 f8055e0299a0a30e4cc3910c359ae3a826fec3b9 SHA256 78ca7d4bfe78103de450de92bd321a0b4233d15f1051df3d0e4206fd061381ea
+MD5 73796418d202ed39a04f9adbd5ccc12a files/lilo-22.7-manpath.patch 444
+RMD160 8bdbb45e5fe7b6c9249d54657978b59190eba104 files/lilo-22.7-manpath.patch 444
+SHA256 78ca7d4bfe78103de450de92bd321a0b4233d15f1051df3d0e4206fd061381ea files/lilo-22.7-manpath.patch 444
 AUX lilo-22.7-novga.patch 936 RMD160 30006a534dbfa228de51c076e026c3b560d42630 SHA1 6cc1892cd5e2856a8fa73c50bcb29cbe7fe5ef32 SHA256 796e342f3fcaddd80c08eab791559074529224cfdf7e5a7f0dee8f2cdbf4657b
 MD5 78f9720430dac90363e7b5120a262a3a files/lilo-22.7-novga.patch 936
 RMD160 30006a534dbfa228de51c076e026c3b560d42630 files/lilo-22.7-novga.patch 936
@@ -87,14 +95,14 @@ DIST lilo-22.7.1.src.tar.gz 429373 RMD160 7be56fb510ada6a54ae7da948efc6e342d0414
 DIST lilo-22.7.2.src.tar.gz 433625 RMD160 03fe32839751b3497dc9f06490dc2cd3bff6b805 SHA1 63b758d86d2242b802bce01da318f8c225eb0589 SHA256 3fae019ee67a63f8fc35aade5e7f61a1dd01a210af1b46c6df4b9862597547da
 DIST lilo-22.7.3.src.tar.gz 436177 RMD160 265e5934183ed01ae74641161ac5eec28716f944 SHA1 d6de449607dfca518ca4e0d5d3be5d7d98eab0e5 SHA256 606aa55b66b6dd8baab0465b7c23aa84a48e594a13b41eb995178a1ca2651fc5
 DIST lilo-22.7.src.tar.gz 428600 RMD160 76fcc2551bef7ded3d3b1c833bc76fbf1cb8c9a7 SHA1 90586882ac875fa5989e0855482df62050669aac SHA256 d6372f8823243bc0d09308477f454004ad3fdb45fdef609ddeb9648995e3c063
+EBUILD lilo-22.7-r1.ebuild 4912 RMD160 3d03dfd776c99edf6f13f992dfb16a2f3e567467 SHA1 928819d5c8f1ee59adc61c496b38e0ccf56b12b4 SHA256 58d19d7c254a767475938ad3571861f1e140aaeedc5d74de3d417bc1e8874047
+MD5 49ce9f4045ae95f7ddf482e808527e77 lilo-22.7-r1.ebuild 4912
+RMD160 3d03dfd776c99edf6f13f992dfb16a2f3e567467 lilo-22.7-r1.ebuild 4912
+SHA256 58d19d7c254a767475938ad3571861f1e140aaeedc5d74de3d417bc1e8874047 lilo-22.7-r1.ebuild 4912
 EBUILD lilo-22.7.1.ebuild 4930 RMD160 907fab3ebc42728a28aa9717dc4ed23fc9863141 SHA1 b382e49a58fb4da233d5428ef7045030c4c504f4 SHA256 13c6124b0cea8e0a3a6c304b7a53e2d84f969f7f0e6a5f5d4e3ee65f935abf16
 MD5 0d8df5686dac4b01375279edc1e26427 lilo-22.7.1.ebuild 4930
 RMD160 907fab3ebc42728a28aa9717dc4ed23fc9863141 lilo-22.7.1.ebuild 4930
 SHA256 13c6124b0cea8e0a3a6c304b7a53e2d84f969f7f0e6a5f5d4e3ee65f935abf16 lilo-22.7.1.ebuild 4930
-EBUILD lilo-22.7.2-r1.ebuild 4933 RMD160 98cde4824f66ad1bbc54edb252428305ebf01329 SHA1 55cd444945a594401311ddcab56a405e123e5502 SHA256 e2ccb1a281fb6dc2dc4909417b421c556b3288ba4a8a4d9dc4824a4b259e07f3
-MD5 d1fb0fd59afb71c88305c0d282bfde01 lilo-22.7.2-r1.ebuild 4933
-RMD160 98cde4824f66ad1bbc54edb252428305ebf01329 lilo-22.7.2-r1.ebuild 4933
-SHA256 e2ccb1a281fb6dc2dc4909417b421c556b3288ba4a8a4d9dc4824a4b259e07f3 lilo-22.7.2-r1.ebuild 4933
 EBUILD lilo-22.7.2-r2.ebuild 5015 RMD160 6db3592a1516f92394858a772fa86423f14b9aef SHA1 5e99b2267ab8e0a23235b05b4888c137fb1d2f51 SHA256 ac40229b91b0f60f8ceb900363443066ee3e3e004eab5c8979b0d9ef70ade573
 MD5 011b37ad2de5e002af346b99c2c61c71 lilo-22.7.2-r2.ebuild 5015
 RMD160 6db3592a1516f92394858a772fa86423f14b9aef lilo-22.7.2-r2.ebuild 5015
@@ -107,10 +115,10 @@ EBUILD lilo-22.7.ebuild 5179 RMD160 30448b86ba811587bacb8f9e88e19d5362ba2fc2 SHA
 MD5 8b40ee8fe163769e5ac0ca24963199cb lilo-22.7.ebuild 5179
 RMD160 30448b86ba811587bacb8f9e88e19d5362ba2fc2 lilo-22.7.ebuild 5179
 SHA256 7ee485dc431faeba7977d309cfd5a966509ef0df6a14578375fc07a2d7a24ca5 lilo-22.7.ebuild 5179
-MISC ChangeLog 6197 RMD160 cefe2c652996d0937c9b417a9f6e1cde6d67b50f SHA1 f8fa3c3d9fedf1cda57c406a51c2a9ade5985ede SHA256 0e84a5d51e6d539a8658ea83d69779373cf3c585ff315ee3ec6894f95c7d570e
-MD5 23b94d784198a9d02d334dede48da8bc ChangeLog 6197
-RMD160 cefe2c652996d0937c9b417a9f6e1cde6d67b50f ChangeLog 6197
-SHA256 0e84a5d51e6d539a8658ea83d69779373cf3c585ff315ee3ec6894f95c7d570e ChangeLog 6197
+MISC ChangeLog 6870 RMD160 f50c6c32581b1e4250290d0e6eb95551e3e2be4b SHA1 4af5c149e6866ccd0b7e5fe0ebe858724b8ec3b7 SHA256 6fd311230b398be201a3fb6d7d08cf5491fa8fb99f18e7a1f0f0b303feb09a00
+MD5 cff8b5be1e24820e8af736555be2eb25 ChangeLog 6870
+RMD160 f50c6c32581b1e4250290d0e6eb95551e3e2be4b ChangeLog 6870
+SHA256 6fd311230b398be201a3fb6d7d08cf5491fa8fb99f18e7a1f0f0b303feb09a00 ChangeLog 6870
 MISC metadata.xml 254 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a SHA1 de5f6d0faac7d5f11daa399f9e875c30cac2ce64 SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a metadata.xml 254
@@ -118,12 +126,12 @@ SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc metadata
 MD5 7fc1cf4cd81ee44127de9fd2239c917a files/digest-lilo-22.7 470
 RMD160 ba4992add068a33f9c52d1cb066161c4437776e7 files/digest-lilo-22.7 470
 SHA256 8fac88a4abb3e558874f9ec02130e31bf9c92753de4e4378b8619b7c893a3989 files/digest-lilo-22.7 470
+MD5 9e87d333fe957f33043b845cc51d504d files/digest-lilo-22.7-r1 470
+RMD160 309a6b2eca93449baf9f1cc5c71403ce558875c5 files/digest-lilo-22.7-r1 470
+SHA256 cb675c72b764174ad4e092a100526b6fbb3ee814924fcc0a522985d9a1da214d files/digest-lilo-22.7-r1 470
 MD5 fe8123168ae8e37e80ac2904736564e1 files/digest-lilo-22.7.1 476
 RMD160 67f5b5ff08bb983f022ded278d61002422e2ecb0 files/digest-lilo-22.7.1 476
 SHA256 33da193d3a701224e343993cf3a4ba30ea8ebef2b23b3c199175025147d0cbe9 files/digest-lilo-22.7.1 476
-MD5 eca7db7a3387b08e368163767a7c8356 files/digest-lilo-22.7.2-r1 476
-RMD160 fb1914ae68175fec2e914be2cfc520d579979472 files/digest-lilo-22.7.2-r1 476
-SHA256 969fb08b4bd066d52832fb908c90cd3d98405d76a4f5b3db3f0441e1211d5a92 files/digest-lilo-22.7.2-r1 476
 MD5 5fe1301c27405c41c58fb991c2ec62b2 files/digest-lilo-22.7.2-r2 476
 RMD160 f638b9934b99c4215d4c7d8f8b1a7bb58c078cdb files/digest-lilo-22.7.2-r2 476
 SHA256 722a87fe49f606a7b7d3490634225fa2fdf16ca2b93e7c247c9da53c4500837b files/digest-lilo-22.7.2-r2 476
@@ -133,7 +141,7 @@ SHA256 b1eeb365d3d00fe71e0612104f6561dbdb6d97a3c087f6615fd2b35a8dc2e743 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFF9udp5vW4rUFj5oRAkl7AJ95bK7z5e588dE6t3HyrZNt+xb6pgCeKD3h
-9CoqeM/edqid6jCbmJVwwlk=
-=9gVA
+iD8DBQFFF+g5p5vW4rUFj5oRAvnjAKCy8CvhWyAq2aeTfQ2+TCiPmd7QrACdFhaJ
+u6cjpcwXPkqHt84DkEqhEOc=
+=DSiu
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/lilo/files/digest-lilo-22.7.2-r1 b/sys-boot/lilo/files/digest-lilo-22.7.2-r1
deleted file mode 100644
index 84ae9e925068..000000000000
--- a/sys-boot/lilo/files/digest-lilo-22.7.2-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 88acd6cac12da7e6da02615ba1ca6ddf dolilo-0.3.tar.bz2 3554
-RMD160 b9ae32021767b3548d6fdfe6b71d9100d81ed2ba dolilo-0.3.tar.bz2 3554
-SHA256 33ecd4f54f06067e937f442d1fd7b219f82dbcb7934311d3d20fe070cc2a30ed dolilo-0.3.tar.bz2 3554
-MD5 2bf1eb08c449a28ebadcf66c48a26567 lilo-22.7.2.src.tar.gz 433625
-RMD160 03fe32839751b3497dc9f06490dc2cd3bff6b805 lilo-22.7.2.src.tar.gz 433625
-SHA256 3fae019ee67a63f8fc35aade5e7f61a1dd01a210af1b46c6df4b9862597547da lilo-22.7.2.src.tar.gz 433625
diff --git a/sys-boot/lilo/lilo-22.7.2-r1.ebuild b/sys-boot/lilo/lilo-22.7.2-r1.ebuild
deleted file mode 100644
index 6f381bebd24a..000000000000
--- a/sys-boot/lilo/lilo-22.7.2-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# 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.2-r1.ebuild,v 1.2 2006/07/17 20:40:09 solar 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 ~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
-
-	# Do not build with DOS support
-	sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile
-	sed -i -e 's|DOS_DIR=/dosC/boot||' ${S}/Makefile
-
-	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
-
-	# 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
-}