commit: b0bd1c72aac266f733760b9243232568cc9b4ba2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue Jun 4 05:20:44 2019 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Jun 4 05:20:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bd1c72
sys-boot/lilo: remove old Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-boot/lilo/Manifest | 2 - .../lilo/files/lilo-22.8-correct-usage-info.patch | 12 -- sys-boot/lilo/files/lilo-22.8-makefile.patch | 42 ----- sys-boot/lilo/files/lilo-22.8-nodevmapper.patch | 13 -- sys-boot/lilo/files/lilo-22.8-novga.patch | 11 -- sys-boot/lilo/lilo-22.8-r2.ebuild | 177 --------------------- 6 files changed, 257 deletions(-) diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index f0ac2e56762..39d90b9ba38 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -1,6 +1,4 @@ -DIST dolilo-0.5.tar.bz2 3777 BLAKE2B 4f168e678c771ba964f141a0af04d6dcb13e0e98f37283c799b5d127547fd511826f941fdba12857b8629e8e6324f2117c618f2c15ed3e49e9aa220be77f79ac SHA512 6bfd0181d922f01903c8c0cdc67fc087c74091d7ffec0ddfb263c18b3a2247fcfbd201995f1724f26f4eb21b91147f209fd7ed485a05c6b9e9f583ea2456baa9 DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936 -DIST lilo-22.8.src.tar.gz 437555 BLAKE2B 319890a7760d8528192c9ba553295f9ba12b204a1512e8b8f62da146bc41ad2b453a853661d184dd31fc8d65f33523db63b9e1d3cf3f2391a64b05efa06c3bcb SHA512 b8a22c73b5f6a0c7ddde7c7af6511f9e85d43bae98603bfa0656dfa0685018b3ed713cfd9932bfac33017b83f807c66a3e25d78a16ea9a15bbfddd0e806714cc DIST lilo-24.0.tar.gz 768631 BLAKE2B 09f6520e16a90eab5f44af440f1e2c2d05abb56e954dbb0237700d8e99f017bab279fa8a5c535114ec58be7416123ea51e91311255ed3036199f3565eec5a3f7 SHA512 4158a0f7ab085da063938df2bc77356f9536aa78208a902561f9e61ec478fb17f204f68407f6809638aea9d2e0c88ffc701548291c1635ab40f5b18a7be6bae7 DIST lilo-24.1.tar.gz 773223 BLAKE2B ceaeaf6696b7b15d95cc6c90c6de63ad731f4d0f6d9e42fea4a245219d446cbecdb7d372ef4cb31dce26c7e149723779244f0319939343edf971ac1a19ba5063 SHA512 d1375cac9654fcb3934e7e5e0533e126ff8700a48154eb5019cf62e4b89f14d2ce7a17b6324795d9b60b37ab7656bfb2c9467f6e9d3540095f5c294579e83883 DIST lilo-24.2.tar.gz 777400 BLAKE2B 71c74235d5df10eed65b67dc1ce2af21163651c752d799da419077025304abf9352535a70f3fb60d086609d8a1c25bf394e29453c338ab022cb2be3cb21af75f SHA512 4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54 diff --git a/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch b/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch deleted file mode 100644 index 87ea4b20ce9..00000000000 --- a/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/lilo.c -+++ b/lilo.c -@@ -548,7 +548,8 @@ - fprintf(errstd,"%7s%s -T help \t\t\tlist additional options\n", "", name); - fprintf(errstd,"%7s%s -X\t\t\t\tinternal compile-time options\n", "", name); - #endif /* !__MSDOS__ */ -- fprintf(errstd,"%7s%s -V [ -v ]\t\t\tversion information\n\n","",name); -+ fprintf(errstd,"%7s%s -V\t\t\t\tversion information\n","",name); -+ fprintf(errstd,"%7s%s -v\t\t\t\tverbose mode\n\n","",name); - exit(1); - } - diff --git a/sys-boot/lilo/files/lilo-22.8-makefile.patch b/sys-boot/lilo/files/lilo-22.8-makefile.patch deleted file mode 100644 index d2a34bbded1..00000000000 --- a/sys-boot/lilo/files/lilo-22.8-makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -69,18 +69,7 @@ - -DMDPRAID -DDEVMAPPER - - --# set the following if you wish LILO.COM to be installed --DOS_DIR=/dosC/boot --# --# select one of the following to place the man pages in the right place --#MAN_DIR=`if [ -z "$(whereis lilo | grep 'lilo.8')" ]; then \ --# whereis lilo | sed -e "sX.* /usrX/usrX" -e "sX/man8/lilo.8.*XX" ; \ --# 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/share/man; fi` --#MAN_DIR=/usr/share/man -+MAN_DIR=/usr/share/man - - # set the compiler optimization level - -@@ -165,10 +154,7 @@ - # - # everything needed to run, just short of installation - # --all: lilo bootsect.b diag1.img # OBSOLETE: $(BOOTS) edit dparam.com activate -- if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then \ -- make diagnostic; \ -- make dosexe; fi -+all: lilo - - # - # everything above plus the statically linked version -@@ -452,7 +438,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.8-nodevmapper.patch b/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch deleted file mode 100644 index f81cbfe92ef..00000000000 --- a/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/files/lilo-22.8-novga.patch b/sys-boot/lilo/files/lilo-22.8-novga.patch deleted file mode 100644 index 939998fe9d4..00000000000 --- a/sys-boot/lilo/files/lilo-22.8-novga.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -66,7 +66,7 @@ - - CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ - -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ -- -DMDPRAID -DDEVMAPPER -+ -DMDPRAID -DDEVMAPPER -DNOVGA - - - MAN_DIR=/usr/share/man diff --git a/sys-boot/lilo/lilo-22.8-r2.ebuild b/sys-boot/lilo/lilo-22.8-r2.ebuild deleted file mode 100644 index 0878e7783f5..00000000000 --- a/sys-boot/lilo/lilo-22.8-r2.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils flag-o-matic toolchain-funcs - -DOLILO_V="0.5" -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="-* amd64 x86" - -DEPEND=">=sys-devel/bin86-0.15.5" -RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )" - -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 - - # we explicitly prevent the custom CFLAGS for stability reasons - if use static; then - emake CC="$(tc-getCC)" lilo.static || die - mv lilo.static lilo || die - else - emake CC="$(tc-getCC)" 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 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 <[email protected]> -# -# Modified for Gentoo for use with the lilo ebuild by: -# Martin Schlemmer <[email protected]> (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 -}
