diff options
| -rw-r--r-- | testing/grub/APKBUILD | 8 | ||||
| -rw-r--r-- | testing/grub/do-not-require-unifont-on-powerpc-ieee1275.patch | 23 |
2 files changed, 3 insertions, 28 deletions
diff --git a/testing/grub/APKBUILD b/testing/grub/APKBUILD index 70da3f051e..4783fdaa02 100644 --- a/testing/grub/APKBUILD +++ b/testing/grub/APKBUILD @@ -3,7 +3,7 @@ pkgname=grub _ver=2.02~beta3 pkgver=2.02_beta3 -pkgrel=5 +pkgrel=6 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !armhf" @@ -11,7 +11,7 @@ license="GPLv3+" depends="" depends_dev="" makedepends="$depends_dev bison flex linux-headers xz-dev lvm2-dev - automake autoconf libtool python2 freetype-dev" + automake autoconf libtool python2 freetype-dev unifont" install="" # strip handled by grub Makefiles, abuild strip breaks xen pv-grub options="!strip" @@ -31,7 +31,6 @@ source="ftp://alpha.gnu.org/gnu/grub/grub-$_ver.tar.xz grub2-accept-empty-module.patch grub-xen-host_grub.cfg 2.02_beta3-mkconfig-alpine.patch - do-not-require-unifont-on-powerpc-ieee1275.patch " builddir="$srcdir/grub-$_ver" @@ -229,5 +228,4 @@ fc15c95bf26b28eee3b5a0d8e5fac538445179cea19a8657cd360e37dd5a95010ea2b899d1e4f369 b9eab870006ab7842e0af27171d3b66fea10835d3fd4e606f241a9898aa28bfc4c1cdf59cece8ad50d2e284a44cba74eb0f390ac29627518f86257a8d586976e fix-gcc-no-pie-specs.patch 098a1742aef131c85d63b934a9815879b991f2e73030cb90ac4b5dcd07d249fa0dd0a281e52ada0e10f05d59223493bd416eb47543242bf0ba336a0ebc9b2a1a grub2-accept-empty-module.patch 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg -5de7c1cc11640a3892447f0daa1e3fd1f67b0c474c8aec555e4e6315b5e6c00491ba02c88b420cec221da0640c6961d639f148746df14a0b2c15bda7989cd25c 2.02_beta3-mkconfig-alpine.patch -dde35771d15d85b1fde29454c24772f65acf4d7c1786e8bc05e159f7e9ef3437a5b6fa04e0d87342cdb90d4521fd88888a7853bb88bb0d659df5fb297e27c8a7 do-not-require-unifont-on-powerpc-ieee1275.patch" +5de7c1cc11640a3892447f0daa1e3fd1f67b0c474c8aec555e4e6315b5e6c00491ba02c88b420cec221da0640c6961d639f148746df14a0b2c15bda7989cd25c 2.02_beta3-mkconfig-alpine.patch" diff --git a/testing/grub/do-not-require-unifont-on-powerpc-ieee1275.patch b/testing/grub/do-not-require-unifont-on-powerpc-ieee1275.patch deleted file mode 100644 index e35f19927f..0000000000 --- a/testing/grub/do-not-require-unifont-on-powerpc-ieee1275.patch +++ /dev/null @@ -1,23 +0,0 @@ -Remove the unifont dependency from build time with powerpc-ieee1275 - -This patch is applied in grub project. For more information: -commit: 0af7539bd297fb03da8166ba0c0c143cd2143fd2 -author: Aaro Koskinen -==== ---- a/configure.ac -+++ b/configure.ac -@@ -1633,11 +1633,11 @@ - FONT_SOURCE= - fi - --if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xcoreboot ); then -+if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$platform" = xcoreboot ); then - if test x"$grub_build_mkfont_excuse" = x ; then -- AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports need unifont]) -+ AC_MSG_ERROR([qemu, coreboot and loongson ports need unifont]) - else -- AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports need unifont ($grub_build_mkfont_excuse)]) -+ AC_MSG_ERROR([qemu, coreboot and loongson ports need unifont ($grub_build_mkfont_excuse)]) - fi - fi - |