diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-09 10:43:40 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-06-16 14:17:59 +0200 |
commit | 5c3b89f91d607f29d83e94db8f96aee350905550 (patch) | |
tree | a954309a5911d44b7a0c35571b88c5f8544c848e | |
parent | bf5323d2b58bab33fcc809886c3b0e75033ac2cf (diff) | |
download | alpine_aports-5c3b89f91d607f29d83e94db8f96aee350905550.tar.bz2 alpine_aports-5c3b89f91d607f29d83e94db8f96aee350905550.tar.xz alpine_aports-5c3b89f91d607f29d83e94db8f96aee350905550.zip |
main/grub: upgrade to 2.02
fixes #7391
-rw-r--r-- | main/grub/2.02_beta3-gcc6-ld-no-pie.patch | 57 | ||||
-rw-r--r-- | main/grub/APKBUILD | 15 | ||||
-rw-r--r-- | main/grub/fix-gcc-no-pie-specs.patch | 11 |
3 files changed, 7 insertions, 76 deletions
diff --git a/main/grub/2.02_beta3-gcc6-ld-no-pie.patch b/main/grub/2.02_beta3-gcc6-ld-no-pie.patch deleted file mode 100644 index 0d81415447..0000000000 --- a/main/grub/2.02_beta3-gcc6-ld-no-pie.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | 2016-05-21 Magnus Granberg <zorry@gentoo.org> | ||
2 | |||
3 | #583042 sys-boot/grub-2.02_beta3-r1: building w/gcc-6[pie]: error: | ||
4 | x86_64-pc-linux-gnu/bin/ld: -r and -shared may not be used together | ||
5 | |||
6 | * acinclude.m4: Add -no-pie check. | ||
7 | * configure.ac: Add -no-pie to TARGET_LDFLAGS if needed. | ||
8 | |||
9 | --- a/acinclude.m4 2015-11-11 20:56:52.000000000 +0100 | ||
10 | +++ b/acinclude.m4 2016-05-17 00:08:22.000000000 +0200 | ||
11 | @@ -390,6 +390,24 @@ else | ||
12 | [fi] | ||
13 | ]) | ||
14 | |||
15 | +dnl Check if the Linker supports `-no-pie'. | ||
16 | +AC_DEFUN([grub_CHECK_NO_PIE], | ||
17 | +[AC_MSG_CHECKING([whether linker accepts -no-pie]) | ||
18 | +AC_CACHE_VAL(grub_cv_cc_ld_nopie, | ||
19 | +[save_LDFLAGS="$LDFLAGS" | ||
20 | +LDFLAGS="$LDFLAGS -no-pie" | ||
21 | +AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], | ||
22 | + [grub_cv_cc_ld_no_pie=yes], | ||
23 | + [grub_cv_cc_ld_no_pie=no]) | ||
24 | +LDFLAGS="$save_LDFLAGS" | ||
25 | +]) | ||
26 | +AC_MSG_RESULT([$grub_cv_cc_ld_no_pie]) | ||
27 | +nopie_possible=no | ||
28 | +if test "x$grub_cv_cc_ld_no_pie" = xyes ; then | ||
29 | + nopie_possible=yes | ||
30 | +fi | ||
31 | +]) | ||
32 | + | ||
33 | dnl Check if the C compiler supports `-fPIC'. | ||
34 | AC_DEFUN([grub_CHECK_PIC],[ | ||
35 | [# Position independent executable. | ||
36 | --- a/configure.ac 2016-02-27 13:40:56.000000000 +0100 | ||
37 | +++ b/configure.ac 2016-05-17 00:57:29.471000000 +0200 | ||
38 | @@ -1184,13 +1184,18 @@ CFLAGS="$TARGET_CFLAGS" | ||
39 | |||
40 | # Position independent executable. | ||
41 | grub_CHECK_PIE | ||
42 | +grub_CHECK_NO_PIE | ||
43 | [# Need that, because some distributions ship compilers that include | ||
44 | -# `-fPIE' in the default specs. | ||
45 | +# `-fPIE' and '-pie' in the default specs. | ||
46 | if [ x"$pie_possible" = xyes ]; then | ||
47 | TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE" | ||
48 | +fi | ||
49 | +if [ x"$nopie_possible" = xyes ] && [ x"$pie_possible" = xyes ]; then | ||
50 | + TARGET_LDFLAGS="$TARGET_LDFLAGS -no-pie" | ||
51 | fi] | ||
52 | |||
53 | CFLAGS="$TARGET_CFLAGS" | ||
54 | +LDFLAGS="$TARGET_LDFLAGS" | ||
55 | |||
56 | # Position independent executable. | ||
57 | grub_CHECK_PIC | ||
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD index 077ac02604..30cf7291a7 100644 --- a/main/grub/APKBUILD +++ b/main/grub/APKBUILD | |||
@@ -1,9 +1,8 @@ | |||
1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> | 1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> |
2 | # Maintainer: | 2 | # Maintainer: |
3 | pkgname=grub | 3 | pkgname=grub |
4 | _ver=2.02~beta3 | 4 | pkgver=2.02 |
5 | pkgver=2.02_beta3 | 5 | pkgrel=1 |
6 | pkgrel=7 | ||
7 | pkgdesc="Bootloader with support for Linux, Multiboot and more" | 6 | pkgdesc="Bootloader with support for Linux, Multiboot and more" |
8 | url="https://www.gnu.org/software/grub/" | 7 | url="https://www.gnu.org/software/grub/" |
9 | arch="all !armhf !s390x" | 8 | arch="all !armhf !s390x" |
@@ -27,14 +26,13 @@ ppc64le) subpackages="$subpackages $pkgname-ieee1275" | |||
27 | s390x) subpackages="$subpackages $pkgname-emu" ;; | 26 | s390x) subpackages="$subpackages $pkgname-emu" ;; |
28 | esac | 27 | esac |
29 | 28 | ||
30 | source="ftp://alpha.gnu.org/gnu/grub/grub-$_ver.tar.xz | 29 | source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz |
31 | 2.02_beta3-gcc6-ld-no-pie.patch | ||
32 | fix-gcc-no-pie-specs.patch | 30 | fix-gcc-no-pie-specs.patch |
33 | grub2-accept-empty-module.patch | 31 | grub2-accept-empty-module.patch |
34 | grub-xen-host_grub.cfg | 32 | grub-xen-host_grub.cfg |
35 | 2.02_beta3-mkconfig-alpine.patch | 33 | 2.02_beta3-mkconfig-alpine.patch |
36 | " | 34 | " |
37 | builddir="$srcdir/grub-$_ver" | 35 | builddir="$srcdir/grub-$pkgver" |
38 | 36 | ||
39 | 37 | ||
40 | _build_bios() { | 38 | _build_bios() { |
@@ -259,9 +257,8 @@ emu() { | |||
259 | mv $pkgdir/usr/lib/grub/*-emu $subpkgdir/usr/lib/grub/ | 257 | mv $pkgdir/usr/lib/grub/*-emu $subpkgdir/usr/lib/grub/ |
260 | } | 258 | } |
261 | 259 | ||
262 | sha512sums="4a530efef4dae45f4046cf3550563f14acb24d25cb88d5e06c93953ca5b1eec115118c6860233a9f627edcddae2571e5d6b867b70ff9dd5c184c9fef83ef7e11 grub-2.02~beta3.tar.xz | 260 | sha512sums="cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 grub-2.02.tar.xz |
263 | fc15c95bf26b28eee3b5a0d8e5fac538445179cea19a8657cd360e37dd5a95010ea2b899d1e4f3692b778a71f79526539ad1c741f028186f0daf135ee1678da0 2.02_beta3-gcc6-ld-no-pie.patch | 261 | f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288 fix-gcc-no-pie-specs.patch |
264 | b9eab870006ab7842e0af27171d3b66fea10835d3fd4e606f241a9898aa28bfc4c1cdf59cece8ad50d2e284a44cba74eb0f390ac29627518f86257a8d586976e fix-gcc-no-pie-specs.patch | ||
265 | 098a1742aef131c85d63b934a9815879b991f2e73030cb90ac4b5dcd07d249fa0dd0a281e52ada0e10f05d59223493bd416eb47543242bf0ba336a0ebc9b2a1a grub2-accept-empty-module.patch | 262 | 098a1742aef131c85d63b934a9815879b991f2e73030cb90ac4b5dcd07d249fa0dd0a281e52ada0e10f05d59223493bd416eb47543242bf0ba336a0ebc9b2a1a grub2-accept-empty-module.patch |
266 | 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg | 263 | 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg |
267 | 5de7c1cc11640a3892447f0daa1e3fd1f67b0c474c8aec555e4e6315b5e6c00491ba02c88b420cec221da0640c6961d639f148746df14a0b2c15bda7989cd25c 2.02_beta3-mkconfig-alpine.patch" | 264 | 5de7c1cc11640a3892447f0daa1e3fd1f67b0c474c8aec555e4e6315b5e6c00491ba02c88b420cec221da0640c6961d639f148746df14a0b2c15bda7989cd25c 2.02_beta3-mkconfig-alpine.patch" |
diff --git a/main/grub/fix-gcc-no-pie-specs.patch b/main/grub/fix-gcc-no-pie-specs.patch index b14c0be3cc..273c9dbe39 100644 --- a/main/grub/fix-gcc-no-pie-specs.patch +++ b/main/grub/fix-gcc-no-pie-specs.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | --- ./configure.ac.orig | 1 | --- ./configure.ac.orig |
2 | +++ ./configure.ac | 2 | +++ ./configure.ac |
3 | @@ -1092,7 +1092,7 @@ | 3 | @@ -1100,7 +1100,7 @@ |
4 | if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then | 4 | if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then |
5 | efiemu_excuse="no suitable link format for efiemu64 found" | 5 | efiemu_excuse="no suitable link format for efiemu64 found" |
6 | else | 6 | else |
@@ -9,12 +9,3 @@ | |||
9 | fi | 9 | fi |
10 | fi | 10 | fi |
11 | if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then | 11 | if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then |
12 | @@ -1188,7 +1188,7 @@ | ||
13 | [# Need that, because some distributions ship compilers that include | ||
14 | # `-fPIE' and '-pie' in the default specs. | ||
15 | if [ x"$pie_possible" = xyes ]; then | ||
16 | - TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE" | ||
17 | + TARGET_CFLAGS="$TARGET_CFLAGS -no-pie" | ||
18 | fi | ||
19 | if [ x"$nopie_possible" = xyes ] && [ x"$pie_possible" = xyes ]; then | ||
20 | TARGET_LDFLAGS="$TARGET_LDFLAGS -no-pie" | ||