| 1 |
commit: b0bd1c72aac266f733760b9243232568cc9b4ba2 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 4 05:20:44 2019 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 4 05:20:44 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bd1c72 |
| 7 |
|
| 8 |
sys-boot/lilo: remove old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
| 11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-boot/lilo/Manifest | 2 - |
| 14 |
.../lilo/files/lilo-22.8-correct-usage-info.patch | 12 -- |
| 15 |
sys-boot/lilo/files/lilo-22.8-makefile.patch | 42 ----- |
| 16 |
sys-boot/lilo/files/lilo-22.8-nodevmapper.patch | 13 -- |
| 17 |
sys-boot/lilo/files/lilo-22.8-novga.patch | 11 -- |
| 18 |
sys-boot/lilo/lilo-22.8-r2.ebuild | 177 --------------------- |
| 19 |
6 files changed, 257 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest |
| 22 |
index f0ac2e56762..39d90b9ba38 100644 |
| 23 |
--- a/sys-boot/lilo/Manifest |
| 24 |
+++ b/sys-boot/lilo/Manifest |
| 25 |
@@ -1,6 +1,4 @@ |
| 26 |
-DIST dolilo-0.5.tar.bz2 3777 BLAKE2B 4f168e678c771ba964f141a0af04d6dcb13e0e98f37283c799b5d127547fd511826f941fdba12857b8629e8e6324f2117c618f2c15ed3e49e9aa220be77f79ac SHA512 6bfd0181d922f01903c8c0cdc67fc087c74091d7ffec0ddfb263c18b3a2247fcfbd201995f1724f26f4eb21b91147f209fd7ed485a05c6b9e9f583ea2456baa9 |
| 27 |
DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936 |
| 28 |
-DIST lilo-22.8.src.tar.gz 437555 BLAKE2B 319890a7760d8528192c9ba553295f9ba12b204a1512e8b8f62da146bc41ad2b453a853661d184dd31fc8d65f33523db63b9e1d3cf3f2391a64b05efa06c3bcb SHA512 b8a22c73b5f6a0c7ddde7c7af6511f9e85d43bae98603bfa0656dfa0685018b3ed713cfd9932bfac33017b83f807c66a3e25d78a16ea9a15bbfddd0e806714cc |
| 29 |
DIST lilo-24.0.tar.gz 768631 BLAKE2B 09f6520e16a90eab5f44af440f1e2c2d05abb56e954dbb0237700d8e99f017bab279fa8a5c535114ec58be7416123ea51e91311255ed3036199f3565eec5a3f7 SHA512 4158a0f7ab085da063938df2bc77356f9536aa78208a902561f9e61ec478fb17f204f68407f6809638aea9d2e0c88ffc701548291c1635ab40f5b18a7be6bae7 |
| 30 |
DIST lilo-24.1.tar.gz 773223 BLAKE2B ceaeaf6696b7b15d95cc6c90c6de63ad731f4d0f6d9e42fea4a245219d446cbecdb7d372ef4cb31dce26c7e149723779244f0319939343edf971ac1a19ba5063 SHA512 d1375cac9654fcb3934e7e5e0533e126ff8700a48154eb5019cf62e4b89f14d2ce7a17b6324795d9b60b37ab7656bfb2c9467f6e9d3540095f5c294579e83883 |
| 31 |
DIST lilo-24.2.tar.gz 777400 BLAKE2B 71c74235d5df10eed65b67dc1ce2af21163651c752d799da419077025304abf9352535a70f3fb60d086609d8a1c25bf394e29453c338ab022cb2be3cb21af75f SHA512 4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54 |
| 32 |
|
| 33 |
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 |
| 34 |
deleted file mode 100644 |
| 35 |
index 87ea4b20ce9..00000000000 |
| 36 |
--- a/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,12 +0,0 @@ |
| 39 |
---- a/lilo.c |
| 40 |
-+++ b/lilo.c |
| 41 |
-@@ -548,7 +548,8 @@ |
| 42 |
- fprintf(errstd,"%7s%s -T help \t\t\tlist additional options\n", "", name); |
| 43 |
- fprintf(errstd,"%7s%s -X\t\t\t\tinternal compile-time options\n", "", name); |
| 44 |
- #endif /* !__MSDOS__ */ |
| 45 |
-- fprintf(errstd,"%7s%s -V [ -v ]\t\t\tversion information\n\n","",name); |
| 46 |
-+ fprintf(errstd,"%7s%s -V\t\t\t\tversion information\n","",name); |
| 47 |
-+ fprintf(errstd,"%7s%s -v\t\t\t\tverbose mode\n\n","",name); |
| 48 |
- exit(1); |
| 49 |
- } |
| 50 |
- |
| 51 |
|
| 52 |
diff --git a/sys-boot/lilo/files/lilo-22.8-makefile.patch b/sys-boot/lilo/files/lilo-22.8-makefile.patch |
| 53 |
deleted file mode 100644 |
| 54 |
index d2a34bbded1..00000000000 |
| 55 |
--- a/sys-boot/lilo/files/lilo-22.8-makefile.patch |
| 56 |
+++ /dev/null |
| 57 |
@@ -1,42 +0,0 @@ |
| 58 |
---- a/Makefile |
| 59 |
-+++ b/Makefile |
| 60 |
-@@ -69,18 +69,7 @@ |
| 61 |
- -DMDPRAID -DDEVMAPPER |
| 62 |
- |
| 63 |
- |
| 64 |
--# set the following if you wish LILO.COM to be installed |
| 65 |
--DOS_DIR=/dosC/boot |
| 66 |
--# |
| 67 |
--# select one of the following to place the man pages in the right place |
| 68 |
--#MAN_DIR=`if [ -z "$(whereis lilo | grep 'lilo.8')" ]; then \ |
| 69 |
--# whereis lilo | sed -e "sX.* /usrX/usrX" -e "sX/man8/lilo.8.*XX" ; \ |
| 70 |
--# elif [ -f /usr/bin/manpath ]; then \ |
| 71 |
--# manpath | sed "s/:.*//"; else echo /usr/man; fi` |
| 72 |
--# |
| 73 |
--MAN_DIR=`if [ -f /usr/bin/manpath ]; then \ |
| 74 |
-- manpath | sed "s/:.*//"; else echo /usr/share/man; fi` |
| 75 |
--#MAN_DIR=/usr/share/man |
| 76 |
-+MAN_DIR=/usr/share/man |
| 77 |
- |
| 78 |
- # set the compiler optimization level |
| 79 |
- |
| 80 |
-@@ -165,10 +154,7 @@ |
| 81 |
- # |
| 82 |
- # everything needed to run, just short of installation |
| 83 |
- # |
| 84 |
--all: lilo bootsect.b diag1.img # OBSOLETE: $(BOOTS) edit dparam.com activate |
| 85 |
-- if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then \ |
| 86 |
-- make diagnostic; \ |
| 87 |
-- make dosexe; fi |
| 88 |
-+all: lilo |
| 89 |
- |
| 90 |
- # |
| 91 |
- # everything above plus the statically linked version |
| 92 |
-@@ -452,7 +438,6 @@ |
| 93 |
- rm -f $$ROOT$(BOOT_DIR)/boot.b; fi |
| 94 |
- cp mkrescue $$ROOT$(SBIN_DIR) |
| 95 |
- cp lilo $$ROOT$(SBIN_DIR) |
| 96 |
-- strip $$ROOT$(SBIN_DIR)/lilo |
| 97 |
- cp keytab-lilo.pl $$ROOT$(USRSBIN_DIR) |
| 98 |
- cp manPages/lilo.8 $$ROOT$(MAN_DIR)/man8 |
| 99 |
- cp manPages/mkrescue.8 $$ROOT$(MAN_DIR)/man8 |
| 100 |
|
| 101 |
diff --git a/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch b/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch |
| 102 |
deleted file mode 100644 |
| 103 |
index f81cbfe92ef..00000000000 |
| 104 |
--- a/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch |
| 105 |
+++ /dev/null |
| 106 |
@@ -1,13 +0,0 @@ |
| 107 |
---- Makefile~ 2007-04-28 22:04:23.000000000 +0200 |
| 108 |
-+++ Makefile 2007-04-28 22:21:46.000000000 +0200 |
| 109 |
-@@ -91,8 +91,8 @@ |
| 110 |
- sed 's/-D/-DLCF_/g'` |
| 111 |
- LILO=-DLILO=0xbb920890 |
| 112 |
- KVER=`if [ -f /usr/include/linux/version.h ]; then echo -DHAS_VERSION_H; fi` |
| 113 |
--HDM=`if [ -f /usr/include/libdevmapper.h ]; then echo -DHAS_LIBDEVMAPPER_H; fi` |
| 114 |
--DEVMAPPER=`if [ -f /usr/include/libdevmapper.h ]; then echo "-ldevmapper"; fi` |
| 115 |
-+HDM= |
| 116 |
-+DEVMAPPER= |
| 117 |
- |
| 118 |
- TMP=_TmP_ |
| 119 |
- |
| 120 |
|
| 121 |
diff --git a/sys-boot/lilo/files/lilo-22.8-novga.patch b/sys-boot/lilo/files/lilo-22.8-novga.patch |
| 122 |
deleted file mode 100644 |
| 123 |
index 939998fe9d4..00000000000 |
| 124 |
--- a/sys-boot/lilo/files/lilo-22.8-novga.patch |
| 125 |
+++ /dev/null |
| 126 |
@@ -1,11 +0,0 @@ |
| 127 |
---- a/Makefile |
| 128 |
-+++ b/Makefile |
| 129 |
-@@ -66,7 +66,7 @@ |
| 130 |
- |
| 131 |
- CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ |
| 132 |
- -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ |
| 133 |
-- -DMDPRAID -DDEVMAPPER |
| 134 |
-+ -DMDPRAID -DDEVMAPPER -DNOVGA |
| 135 |
- |
| 136 |
- |
| 137 |
- MAN_DIR=/usr/share/man |
| 138 |
|
| 139 |
diff --git a/sys-boot/lilo/lilo-22.8-r2.ebuild b/sys-boot/lilo/lilo-22.8-r2.ebuild |
| 140 |
deleted file mode 100644 |
| 141 |
index 0878e7783f5..00000000000 |
| 142 |
--- a/sys-boot/lilo/lilo-22.8-r2.ebuild |
| 143 |
+++ /dev/null |
| 144 |
@@ -1,177 +0,0 @@ |
| 145 |
-# Copyright 1999-2018 Gentoo Foundation |
| 146 |
-# Distributed under the terms of the GNU General Public License v2 |
| 147 |
- |
| 148 |
-EAPI=0 |
| 149 |
- |
| 150 |
-inherit eutils flag-o-matic toolchain-funcs |
| 151 |
- |
| 152 |
-DOLILO_V="0.5" |
| 153 |
-IUSE="static minimal pxeserial device-mapper" |
| 154 |
- |
| 155 |
-DESCRIPTION="Standard Linux boot loader" |
| 156 |
-HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/" |
| 157 |
-DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" |
| 158 |
-MY_P=${P}.src |
| 159 |
- |
| 160 |
-SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz |
| 161 |
- ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${MY_P}.tar.gz |
| 162 |
- ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${MY_P}.tar.gz |
| 163 |
- mirror://gentoo/${DOLILO_TAR}" |
| 164 |
- |
| 165 |
-SLOT="0" |
| 166 |
-LICENSE="BSD GPL-2" |
| 167 |
-KEYWORDS="-* amd64 x86" |
| 168 |
- |
| 169 |
-DEPEND=">=sys-devel/bin86-0.15.5" |
| 170 |
-RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )" |
| 171 |
- |
| 172 |
-src_unpack() { |
| 173 |
- unpack ${MY_P}.tar.gz |
| 174 |
- |
| 175 |
- cd "${S}" |
| 176 |
- |
| 177 |
- # Correctly document commandline options -v and -V, bug #43554 |
| 178 |
- epatch "${FILESDIR}/${P}-correct-usage-info.patch" |
| 179 |
- # Install manpages to correct location, do not rely on incorrect manpath output, bug #117135 |
| 180 |
- # Do not strip the main binary, it upsets portage, bug #140210 |
| 181 |
- # Do not install diag1.img, bug #149887 |
| 182 |
- epatch "${FILESDIR}/${P}-makefile.patch" |
| 183 |
- |
| 184 |
- # this patch is needed when booting PXE and the device you're using |
| 185 |
- # emulates vga console via serial console. |
| 186 |
- # 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. |
| 187 |
- use pxeserial && epatch "${FILESDIR}/${P}-novga.patch" |
| 188 |
- use device-mapper || epatch "${FILESDIR}/${P}-nodevmapper.patch" |
| 189 |
- |
| 190 |
- unpack ${DOLILO_TAR} |
| 191 |
-} |
| 192 |
- |
| 193 |
-src_compile() { |
| 194 |
- # lilo needs this. bug #140209 |
| 195 |
- export LC_ALL=C |
| 196 |
- |
| 197 |
- # we explicitly prevent the custom CFLAGS for stability reasons |
| 198 |
- if use static; then |
| 199 |
- emake CC="$(tc-getCC)" lilo.static || die |
| 200 |
- mv lilo.static lilo || die |
| 201 |
- else |
| 202 |
- emake CC="$(tc-getCC)" lilo || die |
| 203 |
- fi |
| 204 |
-} |
| 205 |
- |
| 206 |
-src_install() { |
| 207 |
- keepdir /boot |
| 208 |
- make ROOT="${D}" install || die |
| 209 |
- |
| 210 |
- if use !minimal; then |
| 211 |
- into / |
| 212 |
- dosbin "${S}"/dolilo/dolilo |
| 213 |
- |
| 214 |
- into /usr |
| 215 |
- dosbin keytab-lilo.pl |
| 216 |
- |
| 217 |
- insinto /etc |
| 218 |
- newins "${FILESDIR}"/lilo.conf lilo.conf.example |
| 219 |
- |
| 220 |
- newconfd "${S}"/dolilo/dolilo.conf.d dolilo.example |
| 221 |
- |
| 222 |
- doman manPages/*.[5-8] |
| 223 |
- dodoc CHANGES INCOMPAT README* |
| 224 |
- docinto samples ; dodoc sample/* |
| 225 |
- fi |
| 226 |
-} |
| 227 |
- |
| 228 |
-# Check whether LILO is installed |
| 229 |
-# This function is from /usr/sbin/mkboot from debianutils, with copyright: |
| 230 |
-# |
| 231 |
-# Debian GNU/Linux |
| 232 |
-# Copyright 1996-1997 Guy Maor <maor@××××××.org> |
| 233 |
-# |
| 234 |
-# Modified for Gentoo for use with the lilo ebuild by: |
| 235 |
-# Martin Schlemmer <azarah@g.o> (16 Mar 2003) |
| 236 |
-# |
| 237 |
-lilocheck () { |
| 238 |
- local bootpart= |
| 239 |
- local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")" |
| 240 |
- |
| 241 |
- echo |
| 242 |
- einfon "Checking for LILO ..." |
| 243 |
- |
| 244 |
- if [ "$(whoami)" != "root" ] |
| 245 |
- then |
| 246 |
- echo; echo |
| 247 |
- eerror "Only root can check for LILO!" |
| 248 |
- return 1 |
| 249 |
- fi |
| 250 |
- |
| 251 |
- if [ -z "${rootpart}" ] |
| 252 |
- then |
| 253 |
- echo; echo |
| 254 |
- eerror "Could not determine root partition!" |
| 255 |
- return 1 |
| 256 |
- fi |
| 257 |
- |
| 258 |
- if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ] |
| 259 |
- then |
| 260 |
- echo " No" |
| 261 |
- return 1 |
| 262 |
- fi |
| 263 |
- |
| 264 |
- bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" /etc/lilo.conf)" |
| 265 |
- |
| 266 |
- if [ -z "${bootpart}" ] |
| 267 |
- then |
| 268 |
- # lilo defaults to current root when 'boot=' is not present |
| 269 |
- bootpart="${rootpart}" |
| 270 |
- fi |
| 271 |
- |
| 272 |
- if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO' |
| 273 |
- then |
| 274 |
- echo; echo |
| 275 |
- ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}" |
| 276 |
- ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand." |
| 277 |
- return 1 |
| 278 |
- fi |
| 279 |
- |
| 280 |
- echo " Yes, on ${bootpart}" |
| 281 |
- |
| 282 |
- return 0 |
| 283 |
-} |
| 284 |
- |
| 285 |
-pkg_postinst() { |
| 286 |
- if [ ! -e "${ROOT}/boot/boot.b" -a ! -L "${ROOT}/boot/boot.b" ] |
| 287 |
- then |
| 288 |
- [ -f "${ROOT}/boot/boot-menu.b" ] && \ |
| 289 |
- ln -snf boot-menu.b "${ROOT}/boot/boot.b" |
| 290 |
- fi |
| 291 |
- |
| 292 |
- if [ "${ROOT}" = "/" ] && use !minimal; |
| 293 |
- then |
| 294 |
- if lilocheck |
| 295 |
- then |
| 296 |
- einfo "Running DOLILO to complete the install ..." |
| 297 |
- # do not redirect to /dev/null because it may display some input |
| 298 |
- # prompt |
| 299 |
- /sbin/dolilo |
| 300 |
- if [ "$?" -ne 0 ] |
| 301 |
- then |
| 302 |
- echo |
| 303 |
- ewarn "Running /sbin/dolilo failed! Please check what the problem is" |
| 304 |
- ewarn "before your next reboot." |
| 305 |
- |
| 306 |
- ebeep 5 |
| 307 |
- epause 5 |
| 308 |
- fi |
| 309 |
- fi |
| 310 |
- echo |
| 311 |
- fi |
| 312 |
- if use !minimal; then |
| 313 |
- echo |
| 314 |
- einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that" |
| 315 |
- einfo "handles mounting and unmounting /boot for you. It can do more then" |
| 316 |
- einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential." |
| 317 |
- ebeep 5 |
| 318 |
- epause 3 |
| 319 |
- echo |
| 320 |
- fi |
| 321 |
-} |
Archives