From a179b2d9427ed31a04a9eff96d28e36b5bbd9bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?=
 <coadde@parabola.nu>
Date: Tue, 25 Oct 2016 00:48:35 -0300
Subject: grub: drop xen support for i686

---
 libre/grub/PKGBUILD | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'libre/grub')

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 9191e302b..9f22b1d63 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -24,7 +24,6 @@ _UNIFONT_VER='8.0.01'
 [[ "${CARCH}" = 'i686' ]] && _EFI_ARCH='i386'
 
 [[ "${CARCH}" = 'x86_64' ]] && _XEN_ARCH='x86_64'
-[[ "${CARCH}" = 'i686' ]] && _XEN_ARCH='i386'
 
 [[ "${CARCH}" = 'armv7h' ]] && _EMU_ARCH='arm'
 [[ "${CARCH}" = 'x86_64' ]] && _EMU_ARCH='x86_64'
@@ -48,7 +47,7 @@ depends=('sh' 'xz' 'gettext' 'device-mapper')
 makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen'
              'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
 
-if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then
+if [[ "${CARCH}" = 'x86_64' ]]; then
 	makedepends+=('xen')
 fi
 
@@ -582,12 +581,14 @@ build() {
 	fi
 
 	if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then
-		msg "Build grub ${_XEN_ARCH} XEN stuff"
-		_build_grub-xen
-
-		if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then
-			msg 'Build grub i386 XEN stuff'
-			_XEN_ARCH='i386' _build_grub-xen
+		if [[ "${CARCH}" = 'x86_64' ]]; then
+			msg "Build grub ${_XEN_ARCH} XEN stuff"
+			_build_grub-xen
+
+			if [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then
+				msg 'Build grub i386 XEN stuff'
+				_XEN_ARCH='i386' _build_grub-xen
+			fi
 		fi
 
 		msg 'Build grub BIOS stuff'
@@ -755,12 +756,14 @@ package_grub() {
 	fi
 
 	if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then
-		msg "Package grub ${_XEN_ARCH} XEN stuff"
-		_package_grub-xen
-
-		if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then
-			msg 'Package grub i386 XEN stuff'
-			_XEN_ARCH='i386' _package_grub-xen
+		if [[ "${CARCH}" = 'x86_64' ]]; then
+			msg "Package grub ${_XEN_ARCH} XEN stuff"
+			_package_grub-xen
+
+			if [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then
+				msg 'Package grub i386 XEN stuff'
+				_XEN_ARCH='i386' _package_grub-xen
+			fi
 		fi
 
 		msg 'Package grub BIOS stuff'
-- 
cgit v1.2.2