aboutsummaryrefslogtreecommitdiffstats
path: root/testing/grub
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2016-12-29 15:10:21 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2016-12-29 15:10:21 +0000
commitbf9902417d4e568f3b05a8199cb0e135610b4378 (patch)
tree22a689423d8b1584cef420fcea54ff4d3d6f72ff /testing/grub
parent272f880a9097469db75dfd9fd0cc36a02673f1bb (diff)
downloadaports-bf9902417d4e568f3b05a8199cb0e135610b4378.tar.bz2
aports-bf9902417d4e568f3b05a8199cb0e135610b4378.tar.xz
testing/grub: Xen not supported on x86
Diffstat (limited to 'testing/grub')
-rw-r--r--testing/grub/APKBUILD36
1 files changed, 21 insertions, 15 deletions
diff --git a/testing/grub/APKBUILD b/testing/grub/APKBUILD
index 17c6f3e715..a01f83f99a 100644
--- a/testing/grub/APKBUILD
+++ b/testing/grub/APKBUILD
@@ -3,7 +3,7 @@
pkgname=grub
_ver=2.02~beta3
pkgver=2.02_beta3
-pkgrel=2
+pkgrel=3
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !armhf"
@@ -15,7 +15,10 @@ makedepends="$depends_dev bison flex linux-headers xz-dev lvm2-dev
install=""
# strip handled by grub Makefiles, abuild strip breaks xen pv-grub
options="!strip"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-efi $pkgname-xenhost"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-efi"
+if [ "$CARCH" != "x86" ]; then
+ subpackages="$subpackages $pkgname-xenhost"
+fi
source="ftp://alpha.gnu.org/gnu/grub/grub-$_ver.tar.xz
2.02_beta3-gcc6-ld-no-pie.patch
fix-gcc-no-pie-specs.patch
@@ -64,20 +67,23 @@ _build_efi() {
}
_build_xen() {
- cd $builddir/xen
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --disable-nls \
- --disable-werror \
- --with-platform=xen \
- --target=$CARCH \
+ #Xen is not supported on x86
+ if [ "$CARCH" != "x86" ]; then
+ cd $builddir/xen
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --disable-nls \
+ --disable-werror \
+ --with-platform=xen \
+ --target=$CARCH \
|| return 1
- make || return 1
+ make || return 1
+ fi
}
build() {