From e43b0867d4aa7f66e297b357c1c5c2edf8bd562f Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 9 Nov 2016 18:30:05 -0300
Subject: grub: minor fix

---
 libre/grub/PKGBUILD | 156 ++++++++++++++++++++++++++--------------------------
 1 file changed, 78 insertions(+), 78 deletions(-)

(limited to 'libre')

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 0bfc61e40..2884401b2 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -50,9 +50,9 @@ 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' ]] && [[ "${_XEN}" = '1' ]]; then
-	makedepends+=('xen')
-fi
+#if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_XEN}" = '1' ]]; then
+#	makedepends+=('xen')
+#fi
 
 if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then
 	makedepends+=('libusbx' 'sdl')
@@ -199,50 +199,50 @@ _build_grub-efi() {
 	make
 }
 
-_build_grub-xen() {
-	msg "Copy the source for building the ${_XEN_ARCH} XEN part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-xen-${_XEN_ARCH}"
-
-	msg "Unset all compiler FLAGS for ${_XEN_ARCH} XEN build"
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-
-	cd "${srcdir}/grub-${_pkgver}-xen-${_XEN_ARCH}"
-
-	msg "Run autogen.sh for ${_XEN_ARCH} XEN build"
-	./autogen.sh
-
-	msg "Run ./configure for ${_XEN_ARCH} XEN build"
-	./configure \
-		--with-platform='xen' \
-		--target="${_XEN_ARCH}" \
-		--disable-efiemu \
-		--enable-mm-debug \
-		--enable-nls \
-		--enable-device-mapper \
-		--enable-cache-stats \
-		--enable-boot-time \
-		--enable-grub-mkfont \
-		--enable-grub-mount \
-		--prefix='/usr' \
-		--bindir='/usr/bin' \
-		--sbindir='/usr/bin' \
-		--mandir='/usr/share/man' \
-		--infodir='/usr/share/info' \
-		--datarootdir='/usr/share' \
-		--sysconfdir='/etc' \
-		--program-prefix='' \
-		--with-bootdir='/boot' \
-		--with-grubdir='grub' \
-		--disable-silent-rules \
-		--disable-werror
-
-	msg "Run make for ${_XEN_ARCH} XEN build"
-	make
-}
+#_build_grub-xen() {
+#	msg "Copy the source for building the ${_XEN_ARCH} XEN part"
+#	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-xen-${_XEN_ARCH}"
+#
+#	msg "Unset all compiler FLAGS for ${_XEN_ARCH} XEN build"
+#	unset CFLAGS
+#	unset CPPFLAGS
+#	unset CXXFLAGS
+#	unset LDFLAGS
+#	unset MAKEFLAGS
+#
+#	cd "${srcdir}/grub-${_pkgver}-xen-${_XEN_ARCH}"
+#
+#	msg "Run autogen.sh for ${_XEN_ARCH} XEN build"
+#	./autogen.sh
+#
+#	msg "Run ./configure for ${_XEN_ARCH} XEN build"
+#	./configure \
+#		--with-platform='xen' \
+#		--target="${_XEN_ARCH}" \
+#		--disable-efiemu \
+#		--enable-mm-debug \
+#		--enable-nls \
+#		--enable-device-mapper \
+#		--enable-cache-stats \
+#		--enable-boot-time \
+#		--enable-grub-mkfont \
+#		--enable-grub-mount \
+#		--prefix='/usr' \
+#		--bindir='/usr/bin' \
+#		--sbindir='/usr/bin' \
+#		--mandir='/usr/share/man' \
+#		--infodir='/usr/share/info' \
+#		--datarootdir='/usr/share' \
+#		--sysconfdir='/etc' \
+#		--program-prefix='' \
+#		--with-bootdir='/boot' \
+#		--with-grubdir='grub' \
+#		--disable-silent-rules \
+#		--disable-werror
+#
+#	msg "Run make for ${_XEN_ARCH} XEN build"
+#	make
+#}
 
 _build_grub-bios() {
 	msg 'Set ARCH dependent variables for BIOS build'
@@ -584,15 +584,15 @@ build() {
 	fi
 
 	if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then
-		if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_XEN}" = '1' ]]; 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
+#		if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_XEN}" = '1' ]]; 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'
 		_build_grub-bios
@@ -609,8 +609,8 @@ build() {
 		msg 'Build grub Multiboot stuff'
 		_build_grub-multiboot
 
-		msg "Build grub ${_XEN_ARCH} XEN stuff"
-		_build_grub-xen
+#		msg "Build grub ${_XEN_ARCH} XEN stuff"
+#		_build_grub-xen
 	elif [[ "${CARCH}" = 'armv7h' ]]; then
 		msg 'Build grub U-Boot stuff'
 		_build_grub-uboot
@@ -634,17 +634,17 @@ _package_grub-efi() {
 	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
 }
 
-_package_grub-xen() {
-	cd "${srcdir}/grub-${_pkgver}-xen-${_XEN_ARCH}/"
-
-	msg "Run make install for ${_XEN_ARCH} XEN build"
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
-	msg "Remove gdb debugging related files for ${_XEN_ARCH} XEN build"
-	rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/{kernel.exec,gdb_grub,gmodule.pl} || true
-}
+#_package_grub-xen() {
+#	cd "${srcdir}/grub-${_pkgver}-xen-${_XEN_ARCH}/"
+#
+#	msg "Run make install for ${_XEN_ARCH} XEN build"
+#	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
+#
+#	msg "Remove gdb debugging related files for ${_XEN_ARCH} XEN build"
+#	rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/*.module || true
+#	rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/*.image || true
+#	rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/{kernel.exec,gdb_grub,gmodule.pl} || true
+#}
 
 _package_grub-bios() {
 	cd "${srcdir}/grub-${_pkgver}-bios/"
@@ -759,15 +759,15 @@ package_grub() {
 	fi
 
 	if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then
-		if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_XEN}" = '1' ]]; 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
+#		if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_XEN}" = '1' ]]; 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'
 		_package_grub-bios
-- 
cgit v1.2.3-54-g00ecf