1 |
commit: a3b433c7367a041e18bb71aab801e701b5e93b51 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 30 18:16:14 2020 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 30 18:16:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b433c7 |
7 |
|
8 |
sys-boot/syslinux: Drop old |
9 |
|
10 |
Closes: https://bugs.gentoo.org/632596 |
11 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
12 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
13 |
|
14 |
sys-boot/syslinux/Manifest | 2 - |
15 |
sys-boot/syslinux/files/syslinux-4.05-nopie.patch | 12 --- |
16 |
sys-boot/syslinux/syslinux-5.10.ebuild | 82 ---------------- |
17 |
sys-boot/syslinux/syslinux-6.03.ebuild | 112 ---------------------- |
18 |
sys-boot/syslinux/syslinux-6.04_pre1-r1.ebuild | 107 --------------------- |
19 |
5 files changed, 315 deletions(-) |
20 |
|
21 |
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest |
22 |
index b9ab5dc8f24..10c5556ec51 100644 |
23 |
--- a/sys-boot/syslinux/Manifest |
24 |
+++ b/sys-boot/syslinux/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
-DIST syslinux-5.10.tar.xz 5315660 BLAKE2B 19d6861bb6220fe57e12d8d6118d37b197c3c771e4d2e7a51ce7db39219e3c837e6d1543d7a3927820f3a34da34ce849f9badbaf9cd83cb5ee24fd5ed7b705f2 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5 |
27 |
-DIST syslinux-6.03.tar.xz 6855224 BLAKE2B 9caccf8bed4e3c3e87393c9dc8f3b3d267c14469bbf8135a648ea41d8a43a4aedbf2b007c6b9a6853de8866152f5bc33e5ea85fca1db86c5f2fac88d97189b0f SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31 |
28 |
DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 |
29 |
|
30 |
diff --git a/sys-boot/syslinux/files/syslinux-4.05-nopie.patch b/sys-boot/syslinux/files/syslinux-4.05-nopie.patch |
31 |
deleted file mode 100644 |
32 |
index b50b6b47689..00000000000 |
33 |
--- a/sys-boot/syslinux/files/syslinux-4.05-nopie.patch |
34 |
+++ /dev/null |
35 |
@@ -1,12 +0,0 @@ |
36 |
-diff -ur a/mk/com32.mk b/mk/com32.mk |
37 |
---- a/mk/com32.mk 2011-12-09 19:28:17.000000000 +0100 |
38 |
-+++ b/mk/com32.mk 2011-12-18 18:22:11.032342645 +0100 |
39 |
-@@ -24,6 +24,8 @@ |
40 |
- GCCOPT += $(call gcc_ok,-freg-struct-return,) |
41 |
- GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os |
42 |
- GCCOPT += $(call gcc_ok,-fPIE,-fPIC) |
43 |
-+GCCOPT += $(call gcc_ok,-nopie,) |
44 |
-+GCCOPT += $(call gcc_ok,-fno-pie,) |
45 |
- GCCOPT += $(call gcc_ok,-fno-exceptions,) |
46 |
- GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,) |
47 |
- GCCOPT += $(call gcc_ok,-fno-strict-aliasing,) |
48 |
|
49 |
diff --git a/sys-boot/syslinux/syslinux-5.10.ebuild b/sys-boot/syslinux/syslinux-5.10.ebuild |
50 |
deleted file mode 100644 |
51 |
index bc99bbf6c4e..00000000000 |
52 |
--- a/sys-boot/syslinux/syslinux-5.10.ebuild |
53 |
+++ /dev/null |
54 |
@@ -1,82 +0,0 @@ |
55 |
-# Copyright 1999-2018 Gentoo Foundation |
56 |
-# Distributed under the terms of the GNU General Public License v2 |
57 |
- |
58 |
-EAPI=4 |
59 |
- |
60 |
-inherit eutils toolchain-funcs |
61 |
- |
62 |
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" |
63 |
-HOMEPAGE="https://www.syslinux.org/" |
64 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.xz" |
65 |
- |
66 |
-LICENSE="GPL-2" |
67 |
-SLOT="0" |
68 |
-KEYWORDS="-* amd64 x86" |
69 |
-IUSE="custom-cflags" |
70 |
- |
71 |
-RDEPEND="sys-fs/mtools |
72 |
- dev-perl/Crypt-PasswdMD5 |
73 |
- dev-perl/Digest-SHA1" |
74 |
-DEPEND="${RDEPEND} |
75 |
- dev-lang/nasm |
76 |
- virtual/os-headers" |
77 |
- |
78 |
-S=${WORKDIR}/${P/_/-} |
79 |
- |
80 |
-# This ebuild is a departure from the old way of rebuilding everything in syslinux |
81 |
-# This departure is necessary since hpa doesn't support the rebuilding of anything other |
82 |
-# than the installers. |
83 |
- |
84 |
-# These are executables which come precompiled and are run by the boot loader |
85 |
-QA_PREBUILT="usr/share/${PN}/*.c32" |
86 |
- |
87 |
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore |
88 |
- |
89 |
-src_prepare() { |
90 |
- # Fix building on hardened |
91 |
- epatch "${FILESDIR}"/${PN}-4.05-nopie.patch |
92 |
- |
93 |
- rm -f gethostip #bug 137081 |
94 |
- |
95 |
- # Don't prestrip or override user LDFLAGS, bug #305783 |
96 |
- local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \ |
97 |
- sample/Makefile utils/Makefile" |
98 |
- sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed" |
99 |
- |
100 |
- if use custom-cflags; then |
101 |
- sed -i ${SYSLINUX_MAKEFILES} \ |
102 |
- -e 's|-g -Os||g' \ |
103 |
- -e 's|-Os||g' \ |
104 |
- -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \ |
105 |
- || die "sed custom-cflags failed" |
106 |
- else |
107 |
- QA_FLAGS_IGNORED=" |
108 |
- /sbin/extlinux |
109 |
- /usr/bin/memdiskfind |
110 |
- /usr/bin/gethostip |
111 |
- /usr/bin/isohybrid |
112 |
- /usr/bin/syslinux |
113 |
- " |
114 |
- fi |
115 |
- |
116 |
-} |
117 |
- |
118 |
-src_compile() { |
119 |
- emake CC="$(tc-getCC)" installer |
120 |
-} |
121 |
- |
122 |
-src_install() { |
123 |
- emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install |
124 |
- dodoc README NEWS doc/*.txt |
125 |
-} |
126 |
- |
127 |
-pkg_postinst() { |
128 |
- # print warning for users upgrading from the previous stable version |
129 |
- if has 4.07 ${REPLACING_VERSIONS}; then |
130 |
- ewarn "syslinux now uses dynamically linked ELF executables. Before you reboot," |
131 |
- ewarn "ensure that needed dependencies are fulfilled. For example, run from your" |
132 |
- ewarn "syslinux directory:" |
133 |
- ewarn |
134 |
- ewarn "LD_LIBRARY_PATH=\".\" ldd menu.c32" |
135 |
- fi |
136 |
-} |
137 |
|
138 |
diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.03.ebuild |
139 |
deleted file mode 100644 |
140 |
index c82f18d21b8..00000000000 |
141 |
--- a/sys-boot/syslinux/syslinux-6.03.ebuild |
142 |
+++ /dev/null |
143 |
@@ -1,112 +0,0 @@ |
144 |
-# Copyright 1999-2018 Gentoo Foundation |
145 |
-# Distributed under the terms of the GNU General Public License v2 |
146 |
- |
147 |
-EAPI=5 |
148 |
- |
149 |
-inherit eutils toolchain-funcs |
150 |
- |
151 |
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" |
152 |
-HOMEPAGE="https://www.syslinux.org/" |
153 |
-# Final releases in 6.xx/$PV.tar.* (literal "xx") |
154 |
-# Testing releases in Testing/$PV/$PV.tar.* |
155 |
-SRC_URI_DIR=${PV:0:1}.xx |
156 |
-SRC_URI_TESTING=Testing/${PV:0:4} |
157 |
-[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING |
158 |
-[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING |
159 |
-[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING |
160 |
-[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING |
161 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz" |
162 |
- |
163 |
-LICENSE="GPL-2" |
164 |
-SLOT="0" |
165 |
-KEYWORDS="-* ~amd64 ~x86" |
166 |
-IUSE="custom-cflags" |
167 |
- |
168 |
-RDEPEND="sys-fs/mtools |
169 |
- dev-perl/Crypt-PasswdMD5 |
170 |
- dev-perl/Digest-SHA1" |
171 |
-DEPEND="${RDEPEND} |
172 |
- dev-lang/nasm |
173 |
- >=sys-boot/gnu-efi-3.0u |
174 |
- virtual/os-headers" |
175 |
- |
176 |
-S=${WORKDIR}/${P/_/-} |
177 |
- |
178 |
-# This ebuild is a departure from the old way of rebuilding everything in syslinux |
179 |
-# This departure is necessary since hpa doesn't support the rebuilding of anything other |
180 |
-# than the installers. |
181 |
- |
182 |
-# These are executables which come precompiled and are run by the boot loader |
183 |
-QA_PREBUILT="usr/share/${PN}/*.c32" |
184 |
- |
185 |
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore |
186 |
- |
187 |
-src_prepare() { |
188 |
- rm -f gethostip #bug 137081 |
189 |
- |
190 |
- epatch "${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928 |
191 |
- |
192 |
- # Don't prestrip or override user LDFLAGS, bug #305783 |
193 |
- local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \ |
194 |
- sample/Makefile utils/Makefile" |
195 |
- sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed" |
196 |
- |
197 |
- if use custom-cflags; then |
198 |
- sed -i ${SYSLINUX_MAKEFILES} \ |
199 |
- -e 's|-g -Os||g' \ |
200 |
- -e 's|-Os||g' \ |
201 |
- -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \ |
202 |
- || die "sed custom-cflags failed" |
203 |
- else |
204 |
- QA_FLAGS_IGNORED=" |
205 |
- /sbin/extlinux |
206 |
- /usr/bin/memdiskfind |
207 |
- /usr/bin/gethostip |
208 |
- /usr/bin/isohybrid |
209 |
- /usr/bin/syslinux |
210 |
- " |
211 |
- fi |
212 |
- case ${ARCH} in |
213 |
- amd64) loaderarch="efi64" ;; |
214 |
- x86) loaderarch="efi32" ;; |
215 |
- *) ewarn "Unsupported architecture, building installers only." ;; |
216 |
- esac |
217 |
- |
218 |
- # building with ld.gold causes problems, bug #563364 |
219 |
- if tc-ld-is-gold; then |
220 |
- ewarn "Building syslinux with the gold linker may cause problems, see bug #563364" |
221 |
- if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then |
222 |
- tc-ld-disable-gold |
223 |
- ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this." |
224 |
- else |
225 |
- ewarn "Continuing anyway as requested." |
226 |
- fi |
227 |
- fi |
228 |
-} |
229 |
- |
230 |
-src_compile() { |
231 |
- # build system abuses the LDFLAGS variable to pass arguments to ld |
232 |
- unset LDFLAGS |
233 |
- if [[ ! -z ${loaderarch} ]]; then |
234 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} |
235 |
- fi |
236 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} installer |
237 |
-} |
238 |
- |
239 |
-src_install() { |
240 |
- # parallel install fails sometimes |
241 |
- einfo "loaderarch=${loaderarch}" |
242 |
- emake -j1 LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install |
243 |
- dodoc README NEWS doc/*.txt |
244 |
-} |
245 |
- |
246 |
-pkg_postinst() { |
247 |
- # print warning for users upgrading from the previous stable version |
248 |
- if has 4.07 ${REPLACING_VERSIONS}; then |
249 |
- ewarn "syslinux now uses dynamically linked ELF executables. Before you reboot," |
250 |
- ewarn "ensure that needed dependencies are fulfilled. For example, run from your" |
251 |
- ewarn "syslinux directory:" |
252 |
- ewarn |
253 |
- ewarn "LD_LIBRARY_PATH=\".\" ldd menu.c32" |
254 |
- fi |
255 |
-} |
256 |
|
257 |
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r1.ebuild |
258 |
deleted file mode 100644 |
259 |
index 194db71f6e5..00000000000 |
260 |
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r1.ebuild |
261 |
+++ /dev/null |
262 |
@@ -1,107 +0,0 @@ |
263 |
-# Copyright 1999-2020 Gentoo Authors |
264 |
-# Distributed under the terms of the GNU General Public License v2 |
265 |
- |
266 |
-EAPI=7 |
267 |
- |
268 |
-inherit eutils toolchain-funcs |
269 |
- |
270 |
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" |
271 |
-HOMEPAGE="https://www.syslinux.org/" |
272 |
-# Final releases in 6.xx/$PV.tar.* (literal "xx") |
273 |
-# Testing releases in Testing/$PV/$PV.tar.* |
274 |
-SRC_URI_DIR=${PV:0:1}.xx |
275 |
-SRC_URI_TESTING=Testing/${PV:0:4} |
276 |
-[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING |
277 |
-[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING |
278 |
-[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING |
279 |
-[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING |
280 |
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz" |
281 |
- |
282 |
-LICENSE="GPL-2" |
283 |
-SLOT="0" |
284 |
-KEYWORDS="-* ~amd64 ~x86" |
285 |
-IUSE="custom-cflags" |
286 |
- |
287 |
-RDEPEND="sys-fs/mtools |
288 |
- dev-perl/Crypt-PasswdMD5 |
289 |
- dev-perl/Digest-SHA1" |
290 |
-DEPEND="${RDEPEND} |
291 |
- dev-lang/nasm |
292 |
- >=sys-boot/gnu-efi-3.0u |
293 |
- virtual/os-headers" |
294 |
- |
295 |
-S=${WORKDIR}/${P/_/-} |
296 |
- |
297 |
-# This ebuild is a departure from the old way of rebuilding everything in syslinux |
298 |
-# This departure is necessary since hpa doesn't support the rebuilding of anything other |
299 |
-# than the installers. |
300 |
- |
301 |
-# These are executables which come precompiled and are run by the boot loader |
302 |
-QA_PREBUILT="usr/share/${PN}/*.c32" |
303 |
- |
304 |
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore |
305 |
- |
306 |
-PATCHES=( |
307 |
- "${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928 |
308 |
- "${FILESDIR}"/${P}-singleloadsegment.patch #662678 |
309 |
- "${FILESDIR}"/${P}-fcommon.patch #705730 |
310 |
-) |
311 |
- |
312 |
-src_prepare() { |
313 |
- default |
314 |
- |
315 |
- rm -f gethostip #bug 137081 |
316 |
- |
317 |
- # Don't prestrip or override user LDFLAGS, bug #305783 |
318 |
- local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \ |
319 |
- sample/Makefile utils/Makefile" |
320 |
- sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed" |
321 |
- |
322 |
- if use custom-cflags; then |
323 |
- sed -i ${SYSLINUX_MAKEFILES} \ |
324 |
- -e 's|-g -Os||g' \ |
325 |
- -e 's|-Os||g' \ |
326 |
- -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \ |
327 |
- || die "sed custom-cflags failed" |
328 |
- else |
329 |
- QA_FLAGS_IGNORED=" |
330 |
- /sbin/extlinux |
331 |
- /usr/bin/memdiskfind |
332 |
- /usr/bin/gethostip |
333 |
- /usr/bin/isohybrid |
334 |
- /usr/bin/syslinux |
335 |
- " |
336 |
- fi |
337 |
- case ${ARCH} in |
338 |
- amd64) loaderarch="efi64" ;; |
339 |
- x86) loaderarch="efi32" ;; |
340 |
- *) ewarn "Unsupported architecture, building installers only." ;; |
341 |
- esac |
342 |
- |
343 |
- # building with ld.gold causes problems, bug #563364 |
344 |
- if tc-ld-is-gold; then |
345 |
- ewarn "Building syslinux with the gold linker may cause problems, see bug #563364" |
346 |
- if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then |
347 |
- tc-ld-disable-gold |
348 |
- ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this." |
349 |
- else |
350 |
- ewarn "Continuing anyway as requested." |
351 |
- fi |
352 |
- fi |
353 |
-} |
354 |
- |
355 |
-src_compile() { |
356 |
- # build system abuses the LDFLAGS variable to pass arguments to ld |
357 |
- unset LDFLAGS |
358 |
- if [[ ! -z ${loaderarch} ]]; then |
359 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} |
360 |
- fi |
361 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} installer |
362 |
-} |
363 |
- |
364 |
-src_install() { |
365 |
- # parallel install fails sometimes |
366 |
- einfo "loaderarch=${loaderarch}" |
367 |
- emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install |
368 |
- dodoc README NEWS doc/*.txt |
369 |
-} |