grub: remove duplicated sources (arm only)

1 files changed, 55 insertions, 271 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 792b8f6d8..6dbef9f66 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -564,261 +564,6 @@ _build_grub-uboot() {
 	make
 }
 
-_build_grub-uboot_am335x-bone() {
-	msg "Copy the source for building the U-Boot (am335x-bone) part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_am335x-bone"
-
-	msg 'Unset all compiler FLAGS for U-Boot (am335x-bone) build'
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-
-	cd "${srcdir}/grub-${_pkgver}-uboot_am335x-bone"
-
-	msg 'Patch to detect am335x-bone device tree blob file (dtb)'
-	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
-
-	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
-	#       ' grub-core/loader/arm/linux.c
-
-	msg 'Run autogen.sh for U-Boot (am335x-bone) build'
-	./autogen.sh
-
-	msg 'Run ./configure for U-Boot (am335x-bone) build'
-	./configure \
-		--with-platform='uboot' \
-		--target='arm' \
-		--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 U-Boot (am335x-bone) build'
-	make
-}
-
-_build_grub-uboot_omap3_beagle() {
-	msg "Copy the source for building the U-Boot (omap3_beagle) part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle"
-
-	msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle) build'
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-
-	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle"
-
-	msg 'Patch to detect omap3_beagle device tree blob file (dtb)'
-	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
-
-	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
-	#       ' grub-core/loader/arm/linux.c
-
-	msg 'Run autogen.sh for U-Boot (omap3_beagle) build'
-	./autogen.sh
-
-	msg 'Run ./configure for U-Boot (omap3_beagle) build'
-	./configure \
-		--with-platform='uboot' \
-		--target='arm' \
-		--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 U-Boot (omap3_beagle) build'
-	make
-}
-
-_build_grub-uboot_omap3_beagle_xm() {
-	msg "Copy the source for building the U-Boot (omap3_beagle_xm) part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm"
-
-	msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle_xm) build'
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-
-	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm"
-
-	msg 'Patch to detect omap3_beagle_xm device tree blob file (dtb)'
-	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
-
-	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
-	#       ' grub-core/loader/arm/linux.c
-
-	msg 'Run autogen.sh for U-Boot (omap3_beagle_xm) build'
-	./autogen.sh
-
-	msg 'Run ./configure for U-Boot (omap3_beagle_xm) build'
-	./configure \
-		--with-platform='uboot' \
-		--target='arm' \
-		--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 U-Boot (omap3_beagle_xm) build'
-	make
-}
-
-_build_grub-uboot_omap3_beagle_xm_ab() {
-	msg "Copy the source for building the U-Boot (omap3_beagle_xm_ab) part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab"
-
-	msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle_xm_ab) build'
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-
-	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab"
-
-	msg 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)'
-	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
-
-	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
-	#       ' grub-core/loader/arm/linux.c
-
-	msg 'Run autogen.sh for U-Boot (omap3_beagle_xm_ab) build'
-	./autogen.sh
-
-	msg 'Run ./configure for U-Boot (omap3_beagle_xm_ab) build'
-	./configure \
-		--with-platform='uboot' \
-		--target='arm' \
-		--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 U-Boot (omap3_beagle_xm_ab) build'
-	make
-}
-
-_build_grub-uboot_udoo() {
-	msg "Copy the source for building the U-Boot (udoo) part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_udoo"
-
-	msg 'Unset all compiler FLAGS for U-Boot (udoo) build'
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-
-	cd "${srcdir}/grub-${_pkgver}-uboot_udoo"
-
-	msg 'Patch to detect udoo device tree blob file (dtb)'
-	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
-
-	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
-	#       ' grub-core/loader/arm/linux.c
-
-	msg 'Run autogen.sh for U-Boot (udoo) build'
-	./autogen.sh
-
-	msg 'Run ./configure for U-Boot (udoo) build'
-	./configure \
-		--with-platform='uboot' \
-		--target='arm' \
-		--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 U-Boot (udoo) build'
-	make
-}
-
 build() {
 	cd "${srcdir}/grub-${_pkgver}/"
 
@@ -861,21 +606,6 @@ build() {
 	elif [[ "${CARCH}" = 'armv7h' ]]; then
 		msg 'Build grub U-Boot stuff'
 		_build_grub-uboot
-
-		msg 'Build grub U-Boot for BeagleBone and BeagleBone Black (am335x-bone) stuff'
-		_build_grub-uboot_am335x-bone
-
-		msg 'Build grub U-Boot for BeagleBoard (omap3_beagle) stuff'
-		_build_grub-uboot_omap3_beagle
-
-		msg 'Build grub U-Boot for BeagleBoard-xM (omap3_beagle_xm) stuff'
-		_build_grub-uboot_omap3_beagle_xm
-
-		msg 'Build grub U-Boot for BeagleBoard-xM rev A/B (omap3_beagle_xm_ab) stuff'
-		_build_grub-uboot_omap3_beagle_xm_ab
-
-		msg 'Build grub U-Boot for UDOO (udoo) stuff'
-		_build_grub-uboot_udoo
 	fi
 
 	if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then
@@ -999,7 +729,6 @@ package_grub() {
 	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
 	             'mtools: For grub-mkrescue FAT FS support')
 
-
 	if [[ "${CARCH}" = 'i686' ]]; then
 		optdepends+=('linux-libre-xen: For boot support into XEN server')
 	fi
@@ -1067,9 +796,16 @@ package_grub-am335x_bone() {
 	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
 	             'mtools: For grub-mkrescue FAT FS support')
 
+	msg "Copy the source for packaging the U-Boot (am335x-bone) part"
+	cp -r "${srcdir}/grub-${_pkgver}-uboot" "${srcdir}/grub-${_pkgver}-uboot_am335x-bone"
+
 	cd "${srcdir}/grub-${_pkgver}-uboot_am335x-bone/"
 
+	msg 'Patch to detect am335x-bone device tree blob file (dtb)'
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
+
 	msg 'Package grub U-Boot stuff'
+	## _package_grub-uboot
 
 	msg 'Run make install for U-Boot build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -1081,6 +817,10 @@ package_grub-am335x_bone() {
 
 	msg 'Install /etc/default/grub (used by grub-mkconfig)'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+
+	## msg 'Patch to detect am335x-bone device tree blob file (dtb)'
+	## cd "${pkgdir}/etc/grub.d/"
+	## patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
 }
 
 package_grub-omap3_beagle() {
@@ -1090,9 +830,16 @@ package_grub-omap3_beagle() {
 	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
 	             'mtools: For grub-mkrescue FAT FS support')
 
+	msg "Copy the source for packaging the U-Boot (omap3_beagle) part"
+	cp -r "${srcdir}/grub-${_pkgver}-uboot" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle"
+
 	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle/"
 
+	msg 'Patch to detect omap3_beagle device tree blob file (dtb)'
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
+
 	msg 'Package grub U-Boot stuff'
+	## _package_grub-uboot
 
 	msg 'Run make install for U-Boot build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -1104,6 +851,10 @@ package_grub-omap3_beagle() {
 
 	msg 'Install /etc/default/grub (used by grub-mkconfig)'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+
+	## msg 'Patch to detect omap3_beagle device tree blob file (dtb)'
+	## cd "${pkgdir}/etc/grub.d/"
+	## patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
 }
 
 package_grub-omap3_beagle_xm() {
@@ -1113,9 +864,16 @@ package_grub-omap3_beagle_xm() {
 	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
 	             'mtools: For grub-mkrescue FAT FS support')
 
+	msg "Copy the source for packaging the U-Boot (omap3_beagle_xm) part"
+	cp -r "${srcdir}/grub-${_pkgver}-uboot" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm"
+
 	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm/"
 
+	msg 'Patch to detect omap3_beagle_xm device tree blob file (dtb)'
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
+
 	msg 'Package grub U-Boot stuff'
+	## _package_grub-uboot
 
 	msg 'Run make install for U-Boot build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -1127,6 +885,10 @@ package_grub-omap3_beagle_xm() {
 
 	msg 'Install /etc/default/grub (used by grub-mkconfig)'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+
+	## msg 'Patch to detect omap3_beagle_xm device tree blob file (dtb)'
+	## cd "${pkgdir}/etc/grub.d/"
+	## patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
 }
 
 package_grub-omap3_beagle_xm_ab() {
@@ -1136,9 +898,16 @@ package_grub-omap3_beagle_xm_ab() {
 	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
 	             'mtools: For grub-mkrescue FAT FS support')
 
+	msg "Copy the source for packaging the U-Boot (omap3_beagle_xm_ab) part"
+	cp -r "${srcdir}/grub-${_pkgver}-uboot" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab"
+
 	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab/"
 
+	msg 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)'
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
+
 	msg 'Package grub U-Boot stuff'
+	## _package_grub-uboot
 
 	msg 'Run make install for U-Boot build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -1150,6 +919,10 @@ package_grub-omap3_beagle_xm_ab() {
 
 	msg 'Install /etc/default/grub (used by grub-mkconfig)'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+
+	## msg 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)'
+	## cd "${pkgdir}/etc/grub.d/"
+	## patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
 }
 
 package_grub-udoo() {
@@ -1158,9 +931,16 @@ package_grub-udoo() {
 	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
 	             'mtools: For grub-mkrescue FAT FS support')
 
+	msg "Copy the source for packaging the U-Boot (udoo) part"
+	cp -r "${srcdir}/grub-${_pkgver}-uboot" "${srcdir}/grub-${_pkgver}-uboot_udoo"
+
 	cd "${srcdir}/grub-${_pkgver}-uboot_udoo/"
 
+	msg 'Patch to detect udoo device tree blob file (dtb)'
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
+
 	msg 'Package grub U-Boot stuff'
+	## _package_grub-uboot
 
 	msg 'Run make install for U-Boot build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -1172,4 +952,8 @@ package_grub-udoo() {
 
 	msg 'Install /etc/default/grub (used by grub-mkconfig)'
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+
+	## msg 'Patch to detect udoo device tree blob file (dtb)'
+	## cd "${pkgdir}/etc/grub.d/"
+	## patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
 }