From: Tony Vroon Date: Wed, 11 Oct 2006 11:48:30 +0000 (+0000) Subject: Revision bump. Patch from Ulrich Mueller to keep diag1.img... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df9ffda3afbd461d80dafb2b391c14d39060db36;p=gentoo.git Revision bump. Patch from Ulrich Mueller to keep diag1.img from being installed. Patch to no longer consider LVM2 containers partionable added, thanks to John Coffman for provided instructions. Removing now redundant 22.7.3 ebuild. Package-Manager: portage-2.1.2_pre2-r7 --- diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index 5ec946c01d26..0abcf6605cac 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -77,6 +77,14 @@ AUX lilo-22.7.3-correct-usage-info.patch 557 RMD160 00947306d7b609ae0a0129e0a3f8 MD5 de6a5065fca97cf5df35c8bc9bebfafc files/lilo-22.7.3-correct-usage-info.patch 557 RMD160 00947306d7b609ae0a0129e0a3f820a51a4d1f75 files/lilo-22.7.3-correct-usage-info.patch 557 SHA256 dc32b41ef2024c7b38b3dde281ac1dae69f9353ce56adce79ca4030b13c65281 files/lilo-22.7.3-correct-usage-info.patch 557 +AUX lilo-22.7.3-lvm2-not-partionable.patch 722 RMD160 72fda5286c36af505a1106aa4d8377907965b6f4 SHA1 e73465c9b8ef695dc5bcaf369098111f7d3563ed SHA256 ba33153df87056fa1d94194f51d7f2c57c46fc70d4463876b4bf7925b800a3a1 +MD5 1081b705a721634da4a46cd9c4ea9c74 files/lilo-22.7.3-lvm2-not-partionable.patch 722 +RMD160 72fda5286c36af505a1106aa4d8377907965b6f4 files/lilo-22.7.3-lvm2-not-partionable.patch 722 +SHA256 ba33153df87056fa1d94194f51d7f2c57c46fc70d4463876b4bf7925b800a3a1 files/lilo-22.7.3-lvm2-not-partionable.patch 722 +AUX lilo-22.7.3-makefile-nodiags.patch 435 RMD160 8cf672abef1161ce10500f7dd78687aa076b0245 SHA1 e060cfaa1574bb40f31e50ba31e66882664c8b4f SHA256 568c6b04b8a203e3145358070e1c59b1df9f3ceea6719d855f54f1e0ed7a2b6d +MD5 01c84aa3b4e7cf5103ff9eb2bd2b2bd7 files/lilo-22.7.3-makefile-nodiags.patch 435 +RMD160 8cf672abef1161ce10500f7dd78687aa076b0245 files/lilo-22.7.3-makefile-nodiags.patch 435 +SHA256 568c6b04b8a203e3145358070e1c59b1df9f3ceea6719d855f54f1e0ed7a2b6d files/lilo-22.7.3-makefile-nodiags.patch 435 AUX lilo-22.7.3-makefile.patch 1894 RMD160 ff3674d256a4df122fc095b5a2571154979fe41b SHA1 e8c4251c84a7ec9471d0fc0aee20c572e75f1864 SHA256 6b71311e7ad08865bda4b88c9672c8f66272e8ccd974331d628403618d5ceb29 MD5 869c6fade7cea4b4b162b1409c677d04 files/lilo-22.7.3-makefile.patch 1894 RMD160 ff3674d256a4df122fc095b5a2571154979fe41b files/lilo-22.7.3-makefile.patch 1894 @@ -107,18 +115,18 @@ EBUILD lilo-22.7.2-r2.ebuild 5015 RMD160 6db3592a1516f92394858a772fa86423f14b9ae MD5 011b37ad2de5e002af346b99c2c61c71 lilo-22.7.2-r2.ebuild 5015 RMD160 6db3592a1516f92394858a772fa86423f14b9aef lilo-22.7.2-r2.ebuild 5015 SHA256 ac40229b91b0f60f8ceb900363443066ee3e3e004eab5c8979b0d9ef70ade573 lilo-22.7.2-r2.ebuild 5015 -EBUILD lilo-22.7.3.ebuild 4475 RMD160 12db3b2d033796eb3757cce89314ec43e88d7eb5 SHA1 dde06ac331a86ae1f966e6c19f3f19291a1b9b85 SHA256 634cbe57580f1c95725c0b03d7b1116b105ef0def1f90d563a7514db861b5677 -MD5 ba85583bcce962479e42af646e30c8df lilo-22.7.3.ebuild 4475 -RMD160 12db3b2d033796eb3757cce89314ec43e88d7eb5 lilo-22.7.3.ebuild 4475 -SHA256 634cbe57580f1c95725c0b03d7b1116b105ef0def1f90d563a7514db861b5677 lilo-22.7.3.ebuild 4475 +EBUILD lilo-22.7.3-r1.ebuild 4669 RMD160 e0845e0f43b998d713dbdba13fd4457163c3c912 SHA1 a06f2f33d68ed5f54b63f784ada00e717703ef40 SHA256 c7762e612e3ecc6a66c468199fc70fc4444725232df49d1a7f8b190c4340fdd7 +MD5 f95679dde09903df181d2403a01afe53 lilo-22.7.3-r1.ebuild 4669 +RMD160 e0845e0f43b998d713dbdba13fd4457163c3c912 lilo-22.7.3-r1.ebuild 4669 +SHA256 c7762e612e3ecc6a66c468199fc70fc4444725232df49d1a7f8b190c4340fdd7 lilo-22.7.3-r1.ebuild 4669 EBUILD lilo-22.7.ebuild 5179 RMD160 30448b86ba811587bacb8f9e88e19d5362ba2fc2 SHA1 dc651bfce8c03911d1ac24c2d004c66905490133 SHA256 7ee485dc431faeba7977d309cfd5a966509ef0df6a14578375fc07a2d7a24ca5 MD5 8b40ee8fe163769e5ac0ca24963199cb lilo-22.7.ebuild 5179 RMD160 30448b86ba811587bacb8f9e88e19d5362ba2fc2 lilo-22.7.ebuild 5179 SHA256 7ee485dc431faeba7977d309cfd5a966509ef0df6a14578375fc07a2d7a24ca5 lilo-22.7.ebuild 5179 -MISC ChangeLog 6870 RMD160 f50c6c32581b1e4250290d0e6eb95551e3e2be4b SHA1 4af5c149e6866ccd0b7e5fe0ebe858724b8ec3b7 SHA256 6fd311230b398be201a3fb6d7d08cf5491fa8fb99f18e7a1f0f0b303feb09a00 -MD5 cff8b5be1e24820e8af736555be2eb25 ChangeLog 6870 -RMD160 f50c6c32581b1e4250290d0e6eb95551e3e2be4b ChangeLog 6870 -SHA256 6fd311230b398be201a3fb6d7d08cf5491fa8fb99f18e7a1f0f0b303feb09a00 ChangeLog 6870 +MISC ChangeLog 7354 RMD160 8e3107c69ee416b3ceee10011862f753efe69af0 SHA1 35e6f8812bd94c5154def89a7433aca0b24207cf SHA256 c98bdbc969fd8c9f2deae0ed4586a0796bb65b8caf02cfbeff207d2e49cf63d9 +MD5 c8f7f3137015f5c8a39b2d6518e3996c ChangeLog 7354 +RMD160 8e3107c69ee416b3ceee10011862f753efe69af0 ChangeLog 7354 +SHA256 c98bdbc969fd8c9f2deae0ed4586a0796bb65b8caf02cfbeff207d2e49cf63d9 ChangeLog 7354 MISC metadata.xml 254 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a SHA1 de5f6d0faac7d5f11daa399f9e875c30cac2ce64 SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a metadata.xml 254 @@ -135,13 +143,13 @@ SHA256 33da193d3a701224e343993cf3a4ba30ea8ebef2b23b3c199175025147d0cbe9 files/di 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 -MD5 90b0607f765663f3559e910794ae055c files/digest-lilo-22.7.3 476 -RMD160 f7fe400c9a7c1c0949c09c98888665492a38f646 files/digest-lilo-22.7.3 476 -SHA256 b1eeb365d3d00fe71e0612104f6561dbdb6d97a3c087f6615fd2b35a8dc2e743 files/digest-lilo-22.7.3 476 +MD5 90b0607f765663f3559e910794ae055c files/digest-lilo-22.7.3-r1 476 +RMD160 f7fe400c9a7c1c0949c09c98888665492a38f646 files/digest-lilo-22.7.3-r1 476 +SHA256 b1eeb365d3d00fe71e0612104f6561dbdb6d97a3c087f6615fd2b35a8dc2e743 files/digest-lilo-22.7.3-r1 476 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) -iD8DBQFFF+g5p5vW4rUFj5oRAvnjAKCy8CvhWyAq2aeTfQ2+TCiPmd7QrACdFhaJ -u6cjpcwXPkqHt84DkEqhEOc= -=DSiu +iD8DBQFFLNoZp5vW4rUFj5oRAuhFAJ4rA13v7cUo1SOkZVC9bCOZ1lzOlACeNCue +IvCqc/D4CPukAi0LFRx7wBY= +=TFbY -----END PGP SIGNATURE----- diff --git a/sys-boot/lilo/files/digest-lilo-22.7.3 b/sys-boot/lilo/files/digest-lilo-22.7.3 deleted file mode 100644 index 480a5f8e31a9..000000000000 --- a/sys-boot/lilo/files/digest-lilo-22.7.3 +++ /dev/null @@ -1,6 +0,0 @@ -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 a3aacf90482e0c07492623042b901503 lilo-22.7.3.src.tar.gz 436177 -RMD160 265e5934183ed01ae74641161ac5eec28716f944 lilo-22.7.3.src.tar.gz 436177 -SHA256 606aa55b66b6dd8baab0465b7c23aa84a48e594a13b41eb995178a1ca2651fc5 lilo-22.7.3.src.tar.gz 436177 diff --git a/sys-boot/lilo/lilo-22.7.3.ebuild b/sys-boot/lilo/lilo-22.7.3.ebuild deleted file mode 100644 index ad726ab7a565..000000000000 --- a/sys-boot/lilo/lilo-22.7.3.ebuild +++ /dev/null @@ -1,181 +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.3.ebuild,v 1.3 2006/09/25 13:36:49 chainsaw Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DOLILO_V="0.4" -IUSE="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" - -DEPEND=">=sys-devel/bin86-0.15.5" - -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 - 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 - - 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 -# -# Modified for Gentoo for use with the lilo ebuild by: -# Martin Schlemmer (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 -}