diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
commit | 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch) | |
tree | 2878053f3e7faed19a1f82c733d3bd29df69991e /sys-boot/lilo | |
parent | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff) |
gentoo resync : 08.06.2019
Diffstat (limited to 'sys-boot/lilo')
-rw-r--r-- | sys-boot/lilo/Manifest | 7 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch | 12 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.8-makefile.patch | 42 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.8-nodevmapper.patch | 13 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.8-novga.patch | 11 | ||||
-rw-r--r-- | sys-boot/lilo/lilo-22.8-r2.ebuild | 177 |
6 files changed, 0 insertions, 262 deletions
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index bcbfbc000203..ddca2680c3b3 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -1,17 +1,10 @@ -AUX lilo-22.8-correct-usage-info.patch 464 BLAKE2B 2cb5d719a80d7748edd03d7958c24a4eb55815a7957de6d0d538e78d50e11b4d616ed684bf3e9f0b5ae3027739741f15c6621f57bfbd5a8bc7e94ec0fa007fce SHA512 a4dcaac22e66a6480e7a7783bf93d509a1b288d9d9f7e7674b8c3aaf43b9168a766c135f3f05f3ae3f22bc3c1689100cf429ffc9ddc8b825abbc514b9cb857fe -AUX lilo-22.8-makefile.patch 1273 BLAKE2B 780d10135efe986f77021551356209a0cf50649daef8eda9e58ec71314d0f413b58363d2698329634dddb436a26ff8941e47bdf011300a05252a6a734e192648 SHA512 d8a0c8017f895f52a2b06ebcccca99bbd1a6020d8dad7f158d99196c98d1781620485c6c9fd980c55d2b28c4acc4581be38db86620d211c5a2ecf82a328111cc -AUX lilo-22.8-nodevmapper.patch 437 BLAKE2B aa18cb2476122c5c5e2757c7a1a143617eecff41b79f48e499084ebe39f64ef2eb186b3159ee03476bceca6c9e49d7bc40df873aafe5b4a6bd0180cbd2202c12 SHA512 401132c02ccfd554b247c62eea778e025591f94b79a82e41b061b7aae5e52f3c3cbebaef96cf56fdc8b4858f1af6202b7ed75881e8a633668bb53bdb26e3e702 -AUX lilo-22.8-novga.patch 295 BLAKE2B fa6fe92f607cbf0d36057059feb199715e922ef7865269d9da420c2e3584d81e77892207e729ca3596f22eececc40121864c1e1f64e3293139a463a9d61e6618 SHA512 ee619280265191f80f07429ed0abe9434219cc00b31d204b613138de449ae9de83f8eb80110c3af36ac52156f3a2b52b8d0795abc8dd8a4ad3df15b654cf71e6 AUX lilo-24.0-novga.patch 497 BLAKE2B 429d139b87d1dc581533c09ad6562d42323ac46663198836b0c8339cb99ce5e7442560a15abd089e995a55afdb2ea07c83e3583b7968ceb206acf6736e4574d5 SHA512 f09dbca336c6117592ec24e972c393941ae336f01a03449a455b9694e7e7c62fe24cd9fabab96380c91472fc701633a0ca41277180b73525e92cadbb71459d45 AUX lilo-24.1-novga.patch 500 BLAKE2B a5ba2f06791812fd7dcafe0882218e6d3884db228f5866604f903972e6914cfdab8379e18eb18f399174581eb72775fda05f1a61df699d39f60564b9a2e337a6 SHA512 067a741086b6df6b5f728ffde3cac949dd9b59cdc11ac1b022f240b69c4a8ef883f5623cc610becd4648f02ad3a243a0d6a939aa8d8c63d9b0158426e6b6f300 AUX lilo.conf 1613 BLAKE2B 746e05ed4a38f553d8534087d3889e3c136531752aa39f5de9404e58dcd520925f369a4300e9d16ba779b9cef0ae0ecfdde9221f064f42e6a5c812ee7effbbaf SHA512 be59f5b97cbf8eda744e8a7a281526b3262c80af7d3c61e5476697e1569e6e419c4055a8e7deaa4f65688769d941466043af81e159367bf893a88b77eb3732d5 -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 -EBUILD lilo-22.8-r2.ebuild 4287 BLAKE2B a115714e4f8aeb776a54de02c9dadc0161f5237a295bdec598bfb6c6bbb371e6f6a1e8e3155f5ef7cef9800a9d2a02af8fe97376b2fa4cfe9a391cf8b8e511a7 SHA512 87834bac950afeffc2ee51866506cec276a842defd1ff58eb7b5b2dc71451e77d2e94072541132304fda45432173ae204783019261f79f04da35adcbddabdd7a EBUILD lilo-24.0-r1.ebuild 3963 BLAKE2B dd05b92cb8c8bf905fd0ed55690b643b457698d3da97a5c4d74f4474613b1dd137abeceb1857bc8d0062a00942aeaac0edc797c3825da909129b01ec3e671eb1 SHA512 238e9fa8b4efbed6c0c79603719956e06d5b010480932c2c22b0be806fd1385a238fa9d1b124dbe860aac0f814dd33dd0022f26c756b780635b6906b1d102391 EBUILD lilo-24.1.ebuild 4116 BLAKE2B 8f1203eb8461890847a0a5a9c490d9ef4e48b802fd4b2d9b2f33360243667378d102a0123a4853144f63e86985139a8c72549a58668d679a533c42cc49665ca6 SHA512 219fd641770b01170d0ff7bec6d8d6df60b7a9c1e5671368ea44aa80fb5c54f7a77d4ca1db4ba8787d02d4885f37ac8899cafa82e91f98ce6fb09f6f32cf47cf EBUILD lilo-24.2.ebuild 4122 BLAKE2B 6d364333c69550b1a5742f7d7fd00e5bbee1e2599f68bced4ea6e87bdd52b4aef3a366fadb9f90d94c063a3dbfc1b9bcd1f728c2188de94d4895e4e93ae87a03 SHA512 8f4e182e938628780799206ec30474d70e421d1479f377d8a6977f8e5aa4a6280b6b078808af5a68b28457a4dd5e62e27cc85cd121cbdfc35ac0cf30c2dd98cd 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 87ea4b20ce9e..000000000000 --- 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 d2a34bbded1d..000000000000 --- 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 f81cbfe92ef5..000000000000 --- 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 939998fe9d4e..000000000000 --- 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 0878e7783f5f..000000000000 --- 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 <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 -} |