Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/
Date: Fri, 01 Jun 2018 14:05:35
Message-Id: 1527861916.f40b5170ed72a3b46874b1fb1c28c865013ecb29.bman@gentoo
1 commit: f40b5170ed72a3b46874b1fb1c28c865013ecb29
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 31 21:42:37 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 1 14:05:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40b5170
7
8 sys-boot/lilo: drop EAPI=2 ebuild
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 sys-boot/lilo/Manifest | 1 -
13 sys-boot/lilo/lilo-23.2-r2.ebuild | 176 --------------------------------------
14 2 files changed, 177 deletions(-)
15
16 diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
17 index ccf846f137f..f0ac2e56762 100644
18 --- a/sys-boot/lilo/Manifest
19 +++ b/sys-boot/lilo/Manifest
20 @@ -1,7 +1,6 @@
21 DIST dolilo-0.5.tar.bz2 3777 BLAKE2B 4f168e678c771ba964f141a0af04d6dcb13e0e98f37283c799b5d127547fd511826f941fdba12857b8629e8e6324f2117c618f2c15ed3e49e9aa220be77f79ac SHA512 6bfd0181d922f01903c8c0cdc67fc087c74091d7ffec0ddfb263c18b3a2247fcfbd201995f1724f26f4eb21b91147f209fd7ed485a05c6b9e9f583ea2456baa9
22 DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936
23 DIST lilo-22.8.src.tar.gz 437555 BLAKE2B 319890a7760d8528192c9ba553295f9ba12b204a1512e8b8f62da146bc41ad2b453a853661d184dd31fc8d65f33523db63b9e1d3cf3f2391a64b05efa06c3bcb SHA512 b8a22c73b5f6a0c7ddde7c7af6511f9e85d43bae98603bfa0656dfa0685018b3ed713cfd9932bfac33017b83f807c66a3e25d78a16ea9a15bbfddd0e806714cc
24 -DIST lilo-23.2.tar.gz 580758 BLAKE2B ad932a78edd671d19a9eb5899ca35902cc1f8450c66abbd7d95c065a7f3bb7dd639343681230e9a2f6d906397b7bc5f549359ab101390df3f84d111accfe1312 SHA512 fe6789d3643751128afcb2c9761623329e84ab05ec84d75d6b13eff991d10a6671617b65f4ab5ef414a6ca4bc530bcf33b96ddeee3f5dce78bb69b8db740f9c5
25 DIST lilo-24.0.tar.gz 768631 BLAKE2B 09f6520e16a90eab5f44af440f1e2c2d05abb56e954dbb0237700d8e99f017bab279fa8a5c535114ec58be7416123ea51e91311255ed3036199f3565eec5a3f7 SHA512 4158a0f7ab085da063938df2bc77356f9536aa78208a902561f9e61ec478fb17f204f68407f6809638aea9d2e0c88ffc701548291c1635ab40f5b18a7be6bae7
26 DIST lilo-24.1.tar.gz 773223 BLAKE2B ceaeaf6696b7b15d95cc6c90c6de63ad731f4d0f6d9e42fea4a245219d446cbecdb7d372ef4cb31dce26c7e149723779244f0319939343edf971ac1a19ba5063 SHA512 d1375cac9654fcb3934e7e5e0533e126ff8700a48154eb5019cf62e4b89f14d2ce7a17b6324795d9b60b37ab7656bfb2c9467f6e9d3540095f5c294579e83883
27 DIST lilo-24.2.tar.gz 777400 BLAKE2B 71c74235d5df10eed65b67dc1ce2af21163651c752d799da419077025304abf9352535a70f3fb60d086609d8a1c25bf394e29453c338ab022cb2be3cb21af75f SHA512 4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54
28
29 diff --git a/sys-boot/lilo/lilo-23.2-r2.ebuild b/sys-boot/lilo/lilo-23.2-r2.ebuild
30 deleted file mode 100644
31 index 2be5f25cd50..00000000000
32 --- a/sys-boot/lilo/lilo-23.2-r2.ebuild
33 +++ /dev/null
34 @@ -1,176 +0,0 @@
35 -# Copyright 1999-2017 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI="2"
39 -
40 -inherit eutils flag-o-matic toolchain-funcs
41 -
42 -DOLILO_V="0.5"
43 -IUSE="static minimal pxeserial device-mapper"
44 -
45 -DESCRIPTION="Standard Linux boot loader"
46 -HOMEPAGE="https://alioth.debian.org/projects/lilo/"
47 -
48 -DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2"
49 -SRC_URI="
50 - http://lilo.alioth.debian.org/ftp/sources/${P}.tar.gz
51 - mirror://gentoo/${DOLILO_TAR}
52 -"
53 -
54 -SLOT="0"
55 -LICENSE="BSD GPL-2"
56 -KEYWORDS="-* amd64 x86"
57 -
58 -DEPEND=">=sys-devel/bin86-0.15.5"
59 -RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
60 -
61 -src_prepare() {
62 - # this patch is needed when booting PXE and the device you're using
63 - # emulates vga console via serial console.
64 - # 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.
65 - use pxeserial && epatch "${FILESDIR}/${PN}-22.8-novga.patch"
66 -
67 - # Do not strip and have parallel make
68 - # FIXME: images/Makefile does weird stuff
69 - sed -i Makefile src/Makefile \
70 - -e '/strip/d;s|^ make| $(MAKE)|g' \
71 - -e '/images install/d' \
72 - -e '/images all/d' \
73 - || die "sed strip failed"
74 -}
75 -
76 -src_configure() {
77 - if ! use device-mapper; then
78 - sed -i make.vars -e 's|-DDEVMAPPER||g' || die
79 - fi
80 -}
81 -
82 -src_compile() {
83 - # lilo needs this. bug #140209
84 - export LC_ALL=C
85 -
86 - # we explicitly prevent the custom CFLAGS for stability reasons
87 - if use static; then
88 - local target=alles
89 - else
90 - local target=all
91 - fi
92 -
93 - emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die
94 -}
95 -
96 -src_install() {
97 - keepdir /boot
98 - emake DESTDIR="${D}" install || die
99 -
100 - if use !minimal; then
101 - into /
102 - dosbin "${WORKDIR}"/dolilo/dolilo || die
103 -
104 - into /usr
105 - dosbin keytab-lilo.pl || die
106 -
107 - insinto /etc
108 - newins "${FILESDIR}"/lilo.conf lilo.conf.example || die
109 -
110 - newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die
111 -
112 - dodoc CHANGELOG* readme/README.* readme/INCOMPAT README
113 - docinto samples ; dodoc sample/*
114 - fi
115 -}
116 -
117 -# Check whether LILO is installed
118 -# This function is from /usr/sbin/mkboot from debianutils, with copyright:
119 -#
120 -# Debian GNU/Linux
121 -# Copyright 1996-1997 Guy Maor <maor@××××××.org>
122 -#
123 -# Modified for Gentoo for use with the lilo ebuild by:
124 -# Martin Schlemmer <azarah@g.o> (16 Mar 2003)
125 -#
126 -lilocheck() {
127 - local bootpart=
128 - local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")"
129 -
130 - echo
131 - einfon "Checking for LILO ..."
132 -
133 - if [ "$(whoami)" != "root" ]
134 - then
135 - echo; echo
136 - eerror "Only root can check for LILO!"
137 - return 1
138 - fi
139 -
140 - if [ -z "${rootpart}" ]
141 - then
142 - echo; echo
143 - eerror "Could not determine root partition!"
144 - return 1
145 - fi
146 -
147 - if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ]
148 - then
149 - echo " No"
150 - return 1
151 - fi
152 -
153 - bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" /etc/lilo.conf)"
154 -
155 - if [ -z "${bootpart}" ]
156 - then
157 - # lilo defaults to current root when 'boot=' is not present
158 - bootpart="${rootpart}"
159 - fi
160 -
161 - if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO'
162 - then
163 - echo; echo
164 - ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}"
165 - ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand."
166 - return 1
167 - fi
168 -
169 - echo " Yes, on ${bootpart}"
170 -
171 - return 0
172 -}
173 -
174 -pkg_postinst() {
175 - if [ ! -e "${ROOT}/boot/boot.b" -a ! -L "${ROOT}/boot/boot.b" ]
176 - then
177 - [ -f "${ROOT}/boot/boot-menu.b" ] && \
178 - ln -snf boot-menu.b "${ROOT}/boot/boot.b"
179 - fi
180 -
181 - if [ "${ROOT}" = "/" ] && use !minimal;
182 - then
183 - if lilocheck
184 - then
185 - einfo "Running DOLILO to complete the install ..."
186 - # do not redirect to /dev/null because it may display some input
187 - # prompt
188 - /sbin/dolilo
189 - if [ "$?" -ne 0 ]
190 - then
191 - echo
192 - ewarn "Running /sbin/dolilo failed! Please check what the problem is"
193 - ewarn "before your next reboot."
194 -
195 - ebeep 5
196 - epause 5
197 - fi
198 - fi
199 - echo
200 - fi
201 - if use !minimal; then
202 - echo
203 - einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that"
204 - einfo "handles mounting and unmounting /boot for you. It can do more then"
205 - einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential."
206 - ebeep 5
207 - epause 3
208 - echo
209 - fi
210 -}