libre/grub: clean up build() and package()

1 files changed, 46 insertions, 66 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 5321f7863..e8ac2a298 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -220,6 +220,8 @@ _build_grub() {
 	local bld_plat="${3#*-}"
 	local bld_configure_options=("${@:4}")
 
+	echo "Build grub ${bld_desc} stuff..."
+
 	echo "Copy the source for building the ${bld_desc} part..."
 	cp -r "${srcdir}/grub/" "${srcdir}/grub-${bld_name}/"
 	cd "${srcdir}/grub-${bld_name}/"
@@ -264,6 +266,7 @@ _build_grub-xen() {
 
 _build_grub-bios() {
 	echo 'Set ARCH dependent variables for BIOS build...'
+	local _EFIEMU
 	if [[ "${CARCH}" = 'x86_64' ]]; then
 		_EFIEMU='--enable-efiemu'
 	else
@@ -331,50 +334,37 @@ _build_grub-uboot() {
 build() {
 	cd "${srcdir}/grub/"
 
-	if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]] || [[ "${CARCH}" = 'armv7h' ]]; then
-		echo "Build grub ${_EFI_ARCH} EFI stuff..."
-		_build_grub-efi
+	# All-CPU platforms ####################################################
 
-		if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then
-			echo 'Build grub i386 EFI stuff...'
-			_EFI_ARCH='i386' _build_grub-efi
-		fi
+	_build_grub-efi
+	if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then
+		_EFI_ARCH='i386' _build_grub-efi
 	fi
 
-	if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then
-		if [[ "${_XEN}" = '1' ]]; then
-			echo "Build grub ${_XEN_ARCH} XEN stuff..."
-			_build_grub-xen
+	if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then
+		_build_grub-emu
+	fi
 
-			if [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then
-				echo 'Build grub i386 XEN stuff...'
-				_XEN_ARCH='i386' _build_grub-xen
-			fi
-		fi
+	# CPU-specific platforms ###############################################
 
-		echo 'Build grub BIOS stuff...'
+	case "$CARCH" in
+	x86_64|i686)
 		_build_grub-bios
-
-		echo 'Build grub QEMU stuff...'
 		_build_grub-qemu
-
-		echo 'Build grub IEEE1275 (OpenFirmware) stuff...'
 		_build_grub-ieee1275
-
-		echo 'Build grub Libreboot stuff...'
 		_build_grub-libreboot
-
-		echo 'Build grub Multiboot stuff...'
 		_build_grub-multiboot
-	elif [[ "${CARCH}" = 'armv7h' ]]; then
-		echo 'Build grub U-Boot stuff...'
+		if [[ "${_XEN}" = '1' ]]; then
+			_build_grub-xen
+			if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then
+				_XEN_ARCH='i386' _build_grub-xen
+			fi
+		fi
+		;;
+	armv7h)
 		_build_grub-uboot
-	fi
-
-	if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then
-		echo 'Build grub emu stuff...'
-		_build_grub-emu
-	fi
+		;;
+	esac
 }
 
 # Usage: _package_grub DIRSUFFIX 'Human Description' CPU-PLATFORM
@@ -383,6 +373,8 @@ _package_grub() {
 	local bld_desc="$2"
 	local bld_cpuplat="$3"
 
+	echo "Package grub ${bld_desc} stuff..."
+
 	cd "${srcdir}/grub-${bld_name}/"
 
 	echo "Run make install for ${bld_desc} build..."
@@ -453,50 +445,39 @@ package_grub() {
 
 	cd "${srcdir}/grub/"
 
-	if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]] || [[ "${CARCH}" = 'armv7h' ]]; then	
-		echo "Package grub ${_EFI_ARCH} EFI stuff..."
-		_package_grub-efi
+	# All-CPU platforms ####################################################
 
-		if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then
-			echo 'Package grub i386 EFI stuff...'
-			_EFI_ARCH='i386' _package_grub-efi
-		fi
+	_package_grub-efi
+	if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then
+		_EFI_ARCH='i386' _package_grub-efi
 	fi
 
-	if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then
-		if [[ "${_XEN}" = '1' ]]; then
-			echo "Package grub ${_XEN_ARCH} XEN stuff..."
-			_package_grub-xen
+	if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then
+		_package_grub-emu
+	fi
 
-			if [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then
-				echo 'Package grub i386 XEN stuff...'
-				_XEN_ARCH='i386' _package_grub-xen
-			fi
-		fi
+	# CPU-specific platforms ###############################################
 
-		echo 'Package grub BIOS stuff...'
+	case "$CARCH" in
+	x86_64|i686)
 		_package_grub-bios
-
-		echo 'Package grub QEMU stuff...'
 		_package_grub-qemu
-
-		echo 'Package grub IEEE1275 (OpenFirmware) stuff...'
 		_package_grub-ieee1275
-
-		echo 'Package grub Libreboot stuff...'
 		_package_grub-libreboot
-
-		echo 'Package grub Multiboot stuff...'
 		_package_grub-multiboot
-	elif [[ "${CARCH}" = 'armv7h' ]]; then
-		echo 'Package grub U-Boot stuff...'
+		if [[ "${_XEN}" = '1' ]]; then
+			_package_grub-xen
+			if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then
+				_XEN_ARCH='i386' _package_grub-xen
+			fi
+		fi
+		;;
+	armv7h)
 		_package_grub-uboot
-	fi
+		;;
+	esac
 
-	if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then
-		echo 'Package grub emu stuff...'
-		_package_grub-emu
-	fi
+	# Common ###############################################################
 
 	echo 'Install /etc/default/grub (used by grub-mkconfig)...'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
@@ -518,7 +499,6 @@ _package_grub-uboot-dev() {
 	echo "Patch to detect $devname device tree blob file (dtb)..."
 	patch -Np1 -i "${srcdir}/1000-${pkgname#grub-}--10_linux-20_linux_xen-detect-devicetree-file.patch"
 
-	echo 'Package grub U-Boot stuff...'
 	_package_grub "uboot_$devname" "$devdesc" 'arm' 'uboot'
 
 	echo 'Install /etc/default/grub (used by grub-mkconfig)...'