libre/grub: factor out the common part of the _package_grub-* functions

1 files changed, 34 insertions, 88 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 7eb37bbb8..5321f7863 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -377,112 +377,66 @@ build() {
 	fi
 }
 
-_package_grub-efi() {
-	cd "${srcdir}/grub-efi-${_EFI_ARCH}/"
+# Usage: _package_grub DIRSUFFIX 'Human Description' CPU-PLATFORM
+_package_grub() {
+	local bld_name="$1"
+	local bld_desc="$2"
+	local bld_cpuplat="$3"
+
+	cd "${srcdir}/grub-${bld_name}/"
 
-	echo "Run make install for ${_EFI_ARCH} EFI build..."
+	echo "Run make install for ${bld_desc} build..."
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
 
-	echo "Remove gdb debugging related files for ${_EFI_ARCH} EFI build..."
-	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	echo "Remove gdb debugging related files for ${bld_desc} build..."
+	rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/*.module || true
+	rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/*.image || true
+	rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/{kernel.exec,gdb_grub,gmodule.pl} || true
 }
 
-_package_grub-xen() {
-	cd "${srcdir}/grub-xen-${_XEN_ARCH}/"
-
-	echo "Run make install for ${_XEN_ARCH} XEN build..."
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
+_package_grub-efi() {
+	_package_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \
+		"${_EFI_ARCH}-efi"
+}
 
-	echo "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() {
+	_package_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \
+		"${_XEN_ARCH}-xen"
 }
 
 _package_grub-bios() {
-	cd "${srcdir}/grub-bios/"
-
-	echo 'Run make install for BIOS build...'
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
-	echo 'Remove gdb debugging related files for BIOS build...'
-	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	_package_grub 'bios' 'BIOS' \
+		'i386-pc'
 }
 
 _package_grub-qemu() {
-	cd "${srcdir}/grub-qemu/"
-
-	echo 'Run make install for QEMU build...'
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
-	echo 'Remove gdb debugging related files for QEMU build...'
-	rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	_package_grub 'qemu' 'QEMU' \
+		'i386-qemu'
 }
 
 _package_grub-ieee1275() {
-	cd "${srcdir}/grub-ieee1275/"
-
-	echo 'Run make install for IEEE1275 (OpenFirmware) build...'
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
-	echo 'Remove gdb debugging related files for IEEE1275 (OpenFirmware) build...'
-	rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	_package_grub 'ieee1275' 'IEEE1275 (OpenFirmware)' \
+		'i386-ieee1275'
 }
 
 _package_grub-libreboot() {
-	cd "${srcdir}/grub-libreboot/"
-
-	echo 'Run make install for Libreboot build...'
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
-	echo 'Remove gdb debugging related files for Libreboot build...'
-	rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	_package_grub 'libreboot' 'Libreboot' \
+		'i386-coreboot'
 }
 
 _package_grub-multiboot() {
-	cd "${srcdir}/grub-multiboot/"
-
-	echo 'Run make install for Multiboot build...'
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
-	echo 'Remove gdb debugging related files for Multiboot build...'
-	rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	_package_grub 'multiboot' 'Multiboot' \
+		'i386-multiboot'
 }
 
 _package_grub-emu() {
-	cd "${srcdir}/grub-emu/"
-
-	echo 'Run make install for emu build...'
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
-	echo 'Remove gdb debugging related files for emu build...'
-	rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	_package_grub 'emu' 'emu' \
+		"${_EMU_ARCH}-emu"
 }
 
 _package_grub-uboot() {
-	cd "${srcdir}/grub-uboot/"
-
-	echo 'Run make install for U-Boot build...'
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
-	echo 'Remove gdb debugging related files for U-Boot build...'
-	rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	_package_grub 'uboot' 'U-Boot' \
+		'arm-uboot'
 }
 
 package_grub() {
@@ -565,15 +519,7 @@ _package_grub-uboot-dev() {
 	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
-
-	echo 'Run make install for U-Boot build...'
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
-	echo 'Remove gdb debugging related files for U-Boot build...'
-	rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	_package_grub "uboot_$devname" "$devdesc" 'arm' 'uboot'
 
 	echo 'Install /etc/default/grub (used by grub-mkconfig)...'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"