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