1 |
commit: 66ff75181e3eee24ac8f887600411b674c41936f |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 11 18:15:45 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 11 18:26:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ff7518 |
7 |
|
8 |
sys-boot/grub: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
sys-boot/grub/Manifest | 2 - |
14 |
sys-boot/grub/grub-2.04_rc1.ebuild | 306 ------------------------------------- |
15 |
2 files changed, 308 deletions(-) |
16 |
|
17 |
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest |
18 |
index ce3bb74bbd8..f281cf017cc 100644 |
19 |
--- a/sys-boot/grub/Manifest |
20 |
+++ b/sys-boot/grub/Manifest |
21 |
@@ -1,7 +1,5 @@ |
22 |
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae |
23 |
DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 |
24 |
DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb |
25 |
-DIST grub-2.04~rc1.tar.xz 6422420 BLAKE2B cf189fea32badba00051734d4e67954009bae016a6b8a366ce41a2ac8ddf8792e2b63262c0a80f1fa5771394ebc76b090f50eac1ccd9f81d594feb8cc15ab400 SHA512 c0bee6a7aced0408d7477fdb8b6fdd3ec48f80f0ecc4e7602d76f9a37081fe08e405faa030b4e4f181f45793641b13f398fe0bed121058ad8729f9a8908703d3 |
26 |
-DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775abbf49f4b64758045a9b5158e75afd01a8425b56e6f6d0ba288a733bf426df363c1ecc78daddec516c33d461bc3b SHA512 9d34a005dd10f212e43075beb71eb39b9cc3403ae1cddec7d79af91b3a3a1beb4a3696075cc94563c8402efe2ad05de552ace77a24da09f1c0b7f95e99b056a3 |
27 |
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0 |
28 |
DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 |
29 |
|
30 |
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 4c47c908530..00000000000 |
33 |
--- a/sys-boot/grub/grub-2.04_rc1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,306 +0,0 @@ |
36 |
-# Copyright 1999-2020 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-if [[ ${PV} == 9999 ]]; then |
42 |
- GRUB_AUTORECONF=1 |
43 |
- GRUB_BOOTSTRAP=1 |
44 |
-fi |
45 |
- |
46 |
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then |
47 |
- PYTHON_COMPAT=( python{2_7,3_{6,7}} ) |
48 |
- inherit python-any-r1 |
49 |
-fi |
50 |
- |
51 |
-if [[ -n ${GRUB_AUTORECONF} ]]; then |
52 |
- WANT_LIBTOOL=none |
53 |
- inherit autotools |
54 |
-fi |
55 |
- |
56 |
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs |
57 |
- |
58 |
-if [[ ${PV} != 9999 ]]; then |
59 |
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then |
60 |
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 |
61 |
- MY_P=${P/_/'~'} |
62 |
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" |
63 |
- S=${WORKDIR}/${MY_P} |
64 |
- else |
65 |
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
66 |
- S=${WORKDIR}/${P%_*} |
67 |
- fi |
68 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
69 |
-else |
70 |
- inherit git-r3 |
71 |
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" |
72 |
-fi |
73 |
- |
74 |
-PATCHES=( |
75 |
- "${FILESDIR}"/gfxpayload.patch |
76 |
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch |
77 |
-) |
78 |
- |
79 |
-DEJAVU=dejavu-sans-ttf-2.37 |
80 |
-UNIFONT=unifont-12.0.01 |
81 |
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) |
82 |
- themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" |
83 |
- |
84 |
-DESCRIPTION="GNU GRUB boot loader" |
85 |
-HOMEPAGE="https://www.gnu.org/software/grub/" |
86 |
- |
87 |
-# Includes licenses for dejavu and unifont |
88 |
-LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )" |
89 |
-SLOT="2/${PVR}" |
90 |
-IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs" |
91 |
- |
92 |
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 ) |
93 |
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" |
94 |
- |
95 |
-REQUIRED_USE=" |
96 |
- grub_platforms_coreboot? ( fonts ) |
97 |
- grub_platforms_qemu? ( fonts ) |
98 |
- grub_platforms_ieee1275? ( fonts ) |
99 |
- grub_platforms_loongson? ( fonts ) |
100 |
-" |
101 |
- |
102 |
-BDEPEND=" |
103 |
- ${PYTHON_DEPS} |
104 |
- app-misc/pax-utils |
105 |
- sys-devel/flex |
106 |
- sys-devel/bison |
107 |
- sys-apps/help2man |
108 |
- sys-apps/texinfo |
109 |
- fonts? ( |
110 |
- media-libs/freetype:2 |
111 |
- virtual/pkgconfig |
112 |
- ) |
113 |
- test? ( |
114 |
- app-admin/genromfs |
115 |
- app-arch/cpio |
116 |
- app-arch/lzop |
117 |
- app-emulation/qemu |
118 |
- dev-libs/libisoburn |
119 |
- sys-apps/miscfiles |
120 |
- sys-block/parted |
121 |
- sys-fs/squashfs-tools |
122 |
- ) |
123 |
- themes? ( |
124 |
- app-arch/unzip |
125 |
- media-libs/freetype:2 |
126 |
- virtual/pkgconfig |
127 |
- ) |
128 |
- truetype? ( virtual/pkgconfig ) |
129 |
-" |
130 |
-COMMON_DEPEND=" |
131 |
- app-arch/xz-utils |
132 |
- >=sys-libs/ncurses-5.2-r5:0= |
133 |
- sdl? ( media-libs/libsdl ) |
134 |
- device-mapper? ( >=sys-fs/lvm2-2.02.45 ) |
135 |
- libzfs? ( sys-fs/zfs ) |
136 |
- mount? ( sys-fs/fuse:0 ) |
137 |
- truetype? ( media-libs/freetype:2= ) |
138 |
- ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) |
139 |
- ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) |
140 |
- grub_platforms_xen? ( app-emulation/xen-tools:= ) |
141 |
- grub_platforms_xen-32? ( app-emulation/xen-tools:= ) |
142 |
-" |
143 |
-DEPEND="${COMMON_DEPEND} |
144 |
- static? ( |
145 |
- app-arch/xz-utils[static-libs(+)] |
146 |
- truetype? ( |
147 |
- app-arch/bzip2[static-libs(+)] |
148 |
- media-libs/freetype[static-libs(+)] |
149 |
- sys-libs/zlib[static-libs(+)] |
150 |
- virtual/pkgconfig |
151 |
- ) |
152 |
- ) |
153 |
-" |
154 |
-RDEPEND="${COMMON_DEPEND} |
155 |
- kernel_linux? ( |
156 |
- grub_platforms_efi-32? ( sys-boot/efibootmgr ) |
157 |
- grub_platforms_efi-64? ( sys-boot/efibootmgr ) |
158 |
- ) |
159 |
- !sys-boot/grub:0 !sys-boot/grub-static |
160 |
- nls? ( sys-devel/gettext ) |
161 |
-" |
162 |
- |
163 |
-RESTRICT="strip !test? ( test )" |
164 |
- |
165 |
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*" |
166 |
-QA_WX_LOAD="usr/lib/grub/*" |
167 |
-QA_MULTILIB_PATHS="usr/lib/grub/.*" |
168 |
- |
169 |
-src_unpack() { |
170 |
- if [[ ${PV} == 9999 ]]; then |
171 |
- git-r3_src_unpack |
172 |
- pushd "${P}" >/dev/null || die |
173 |
- local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git" |
174 |
- local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}") |
175 |
- git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}" |
176 |
- git-r3_checkout "${GNULIB_URI}" gnulib |
177 |
- popd >/dev/null || die |
178 |
- fi |
179 |
- default |
180 |
-} |
181 |
- |
182 |
-src_prepare() { |
183 |
- default |
184 |
- |
185 |
- sed -i -e /autoreconf/d autogen.sh || die |
186 |
- |
187 |
- # Nothing in Gentoo packages 'american-english' in the exact path |
188 |
- # wanted for the test, but all that is needed is a compressible text |
189 |
- # file, and we do have 'words' from miscfiles in the same path. |
190 |
- sed -i \ |
191 |
- -e '/CFILESSRC.*=/s,american-english,words,' \ |
192 |
- tests/util/grub-fs-tester.in \ |
193 |
- || die |
194 |
- |
195 |
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then |
196 |
- python_setup |
197 |
- fi |
198 |
- |
199 |
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then |
200 |
- eautopoint --force |
201 |
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die |
202 |
- elif [[ -n ${GRUB_AUTOGEN} ]]; then |
203 |
- ./autogen.sh || die |
204 |
- fi |
205 |
- |
206 |
- if [[ -n ${GRUB_AUTORECONF} ]]; then |
207 |
- eautoreconf |
208 |
- fi |
209 |
-} |
210 |
- |
211 |
-grub_do() { |
212 |
- multibuild_foreach_variant run_in_build_dir "$@" |
213 |
-} |
214 |
- |
215 |
-grub_do_once() { |
216 |
- multibuild_for_best_variant run_in_build_dir "$@" |
217 |
-} |
218 |
- |
219 |
-grub_configure() { |
220 |
- local platform |
221 |
- |
222 |
- case ${MULTIBUILD_VARIANT} in |
223 |
- efi*) platform=efi ;; |
224 |
- xen*) platform=xen ;; |
225 |
- guessed) ;; |
226 |
- *) platform=${MULTIBUILD_VARIANT} ;; |
227 |
- esac |
228 |
- |
229 |
- case ${MULTIBUILD_VARIANT} in |
230 |
- *-32) |
231 |
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then |
232 |
- local CTARGET=i386 |
233 |
- fi ;; |
234 |
- *-64) |
235 |
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then |
236 |
- local CTARGET=x86_64 |
237 |
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" |
238 |
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" |
239 |
- fi ;; |
240 |
- esac |
241 |
- |
242 |
- local myeconfargs=( |
243 |
- --disable-werror |
244 |
- --program-prefix= |
245 |
- --libdir="${EPREFIX}"/usr/lib |
246 |
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
247 |
- $(use_enable device-mapper) |
248 |
- $(use_enable mount grub-mount) |
249 |
- $(use_enable nls) |
250 |
- $(use_enable themes grub-themes) |
251 |
- $(use_enable truetype grub-mkfont) |
252 |
- $(use_enable libzfs) |
253 |
- $(use_enable sdl grub-emu-sdl) |
254 |
- ${platform:+--with-platform=}${platform} |
255 |
- |
256 |
- # Let configure detect this where supported |
257 |
- $(usex efiemu '' '--disable-efiemu') |
258 |
- ) |
259 |
- |
260 |
- if use fonts; then |
261 |
- ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die |
262 |
- fi |
263 |
- |
264 |
- if use themes; then |
265 |
- ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die |
266 |
- fi |
267 |
- |
268 |
- local ECONF_SOURCE="${S}" |
269 |
- econf "${myeconfargs[@]}" |
270 |
-} |
271 |
- |
272 |
-src_configure() { |
273 |
- # Bug 508758. |
274 |
- replace-flags -O3 -O2 |
275 |
- |
276 |
- # We don't want to leak flags onto boot code. |
277 |
- export HOST_CCASFLAGS=${CCASFLAGS} |
278 |
- export HOST_CFLAGS=${CFLAGS} |
279 |
- export HOST_CPPFLAGS=${CPPFLAGS} |
280 |
- export HOST_LDFLAGS=${LDFLAGS} |
281 |
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS |
282 |
- |
283 |
- use static && HOST_LDFLAGS+=" -static" |
284 |
- |
285 |
- tc-ld-disable-gold #439082 #466536 #526348 |
286 |
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}" |
287 |
- unset LDFLAGS |
288 |
- |
289 |
- tc-export CC NM OBJCOPY RANLIB STRIP |
290 |
- tc-export BUILD_CC # Bug 485592 |
291 |
- |
292 |
- MULTIBUILD_VARIANTS=() |
293 |
- local p |
294 |
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do |
295 |
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" ) |
296 |
- done |
297 |
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed ) |
298 |
- grub_do grub_configure |
299 |
-} |
300 |
- |
301 |
-src_compile() { |
302 |
- # Sandbox bug 404013. |
303 |
- use libzfs && addpredict /etc/dfs:/dev/zfs |
304 |
- |
305 |
- grub_do emake |
306 |
- use doc && grub_do_once emake -C docs html |
307 |
-} |
308 |
- |
309 |
-src_test() { |
310 |
- # The qemu dependency is a bit complex. |
311 |
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. |
312 |
- grub_do emake check |
313 |
-} |
314 |
- |
315 |
-src_install() { |
316 |
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" |
317 |
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}" |
318 |
- |
319 |
- einstalldocs |
320 |
- |
321 |
- insinto /etc/default |
322 |
- newins "${FILESDIR}"/grub.default-3 grub |
323 |
-} |
324 |
- |
325 |
-pkg_postinst() { |
326 |
- elog "For information on how to configure GRUB2 please refer to the guide:" |
327 |
- elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start" |
328 |
- |
329 |
- if has_version 'sys-boot/grub:0'; then |
330 |
- elog "A migration guide for GRUB Legacy users is available:" |
331 |
- elog " https://wiki.gentoo.org/wiki/GRUB2_Migration" |
332 |
- fi |
333 |
- |
334 |
- if [[ -z ${REPLACING_VERSIONS} ]]; then |
335 |
- elog |
336 |
- elog "You may consider installing the following optional packages:" |
337 |
- optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober |
338 |
- optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn |
339 |
- optfeature "Enable RAID device detection" sys-fs/mdadm |
340 |
- fi |
341 |
-} |