grub-2:2.02-1.parabola1: updating version

1 files changed, 59 insertions, 75 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 8ec5e3c1c..2ed63f33b 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,5 +1,6 @@
-# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Christian Hesse <mail@eworm.de>
 # Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>
+# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # Contributor (Arch): Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
@@ -16,8 +17,6 @@ _IA32_XEN_IN_ARCH_X64='1'
 ## '1' to enable EMU build (x86_64 and i686 only), "0" to disable
 _GRUB_EMU_BUILD='0'
 
-_pkgver='2.02'
-_GRUB_GIT_TAG='2.02-rc2'
 _GRUB_EXTRAS_COMMIT=f2a079441939eee7251bf141986cdd78946e1d20
 
 _UNIFONT_VER='9.0.06'
@@ -37,13 +36,14 @@ pkgname=('grub')
 [[ $CARCH = armv7h ]] && pkgname+=('grub-am335x_bone' 'grub-udoo' 'grub-omap3_beagle'
                                    'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab')
 pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)'
-pkgver='2.02.rc2'
+pkgver='2.02'
 pkgrel='1.parabola1'
-epoch='1'
+epoch='2'
 url='https://www.gnu.org/software/grub/'
 arch=('x86_64' 'i686' 'armv7h')
 license=('GPL3')
-backup=('etc/default/grub' 'etc/grub.d/40_custom')
+backup=('etc/default/grub'
+        'etc/grub.d/40_custom')
 install="${pkgname}.install"
 options=('!makeflags')
 depends=('sh' 'xz' 'gettext' 'device-mapper')
@@ -71,10 +71,9 @@ elif [[ "${CARCH}" = 'armv7h' ]]; then
 	replaces=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}")
 fi
 
-source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}"
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
         "grub-extras::git+git://git.sv.gnu.org/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}"
-        "https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"
-        "https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig"
+        "https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig}
         '0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch'
         '0004-add-GRUB_COLOR_variables.patch'
         'grub.default'
@@ -85,7 +84,8 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}
         '0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch'
         '0003-10_linux-20_linux_xen-rebrand-free-distros.patch')
 
-sha512sums=('SKIP'
+sha512sums=('cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088'
+            'SKIP'
             'SKIP'
             'dac2becc7fa76847231ce30a4b9e22fc9d45fb50846fc7f25611c5c2cbedc31e7745d9295bab3eb7a01efad4f1f2f1161c98efa60048e756421075220817f4b8'
             'SKIP'
@@ -99,15 +99,11 @@ sha512sums=('SKIP'
             '378635a2a8a685f4efd300f19d7f2192dc664fd16811953520e0d49d90a5af377fa0dc45e0d2abc0d9f6750cd4cf885d6ef54445f7e8d3ed0025f2d087351bfc'
             'eced721bab4256b9afb322cda7b599ac1cae9dfe2effd1d86569bd3bef056cab80783da25181e627abc2422f4048200ae8b46c7dfe5df4441a55ae00434cd172')
 
-validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy
-
-_pkgver() {
-	cd "${srcdir}/grub-${_pkgver}/"
-	echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g'
-}
+validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209'  # Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
+              '95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy
 
 prepare() {
-	cd "${srcdir}/grub-${_pkgver}/"
+	cd "${srcdir}/grub-${pkgver}/"
 
 	msg 'Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig'
 	patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch"
@@ -117,35 +113,33 @@ prepare() {
 	patch -Np1 -i "${srcdir}/0004-add-GRUB_COLOR_variables.patch"
 
 	msg 'Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme'
-	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac"
+	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
 
 	msg 'Rebranding for some free distros'
 	patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-rebrand-free-distros.patch"
 
 	msg "Fix mkinitcpio 'rw' FS#36275"
-	sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
-
-	# msg 'autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3'
-	# sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
+	sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
 
 	msg 'Pull in latest language files'
 	./linguas.sh
 
 	msg 'Remove not working langs which need LC_ALL=C.UTF-8'
-	sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS"
+	sed -e 's#en@cyrillic en@greek##g' -i "po/LINGUAS"
 
 	msg 'Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847'
-	cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf"
+	cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "unifont.bdf"
 
 	msg "Add the grub-extra sources for BIOS build"
-	install -d "${srcdir}/grub-${_pkgver}/grub-extras"
-	cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}/grub-extras/915resolution"
-	export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}/grub-extras/"
+	install -d "grub-extras"
+	cp -r "${srcdir}/grub-extras/915resolution" "grub-extras/915resolution"
+	export GRUB_CONTRIB="${srcdir}/grub-${pkgver}/grub-extras/"
 }
 
 _build_grub-efi() {
 	msg "Copy the source for building the ${_EFI_ARCH} EFI part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}"
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi-${_EFI_ARCH}"
+	cd "${srcdir}/grub-${pkgver}-efi-${_EFI_ARCH}"
 
 	msg "Unset all compiler FLAGS for ${_EFI_ARCH} EFI build"
 	unset CFLAGS
@@ -154,8 +148,6 @@ _build_grub-efi() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 
-	cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}"
-
 	msg 'Run autogen.sh for ${_EFI_ARCH} EFI build'
 	./autogen.sh
 
@@ -190,7 +182,8 @@ _build_grub-efi() {
 
 #_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}"
+#	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-xen-${_XEN_ARCH}"
+#	cd "${srcdir}/grub-${pkgver}-xen-${_XEN_ARCH}"
 #
 #	msg "Unset all compiler FLAGS for ${_XEN_ARCH} XEN build"
 #	unset CFLAGS
@@ -199,8 +192,6 @@ _build_grub-efi() {
 #	unset LDFLAGS
 #	unset MAKEFLAGS
 #
-#	cd "${srcdir}/grub-${_pkgver}-xen-${_XEN_ARCH}"
-#
 #	msg "Run autogen.sh for ${_XEN_ARCH} XEN build"
 #	./autogen.sh
 #
@@ -242,7 +233,8 @@ _build_grub-bios() {
 	fi
 
 	msg 'Copy the source for building the BIOS part'
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios"
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios"
+	cd "${srcdir}/grub-${pkgver}-bios"
 
 	msg 'Unset all compiler FLAGS for BIOS build'
 	unset CFLAGS
@@ -251,8 +243,6 @@ _build_grub-bios() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 
-	cd "${srcdir}/grub-${_pkgver}-bios"
-
 	msg 'Run autogen.sh for BIOS build'
 	./autogen.sh
 
@@ -287,7 +277,8 @@ _build_grub-bios() {
 
 _build_grub-qemu() {
 	msg 'Copy the source for building the QEMU part'
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-qemu"
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-qemu"
+	cd "${srcdir}/grub-${pkgver}-qemu"
 
 	msg 'Unset all compiler FLAGS for QEMU build'
 	unset CFLAGS
@@ -296,8 +287,6 @@ _build_grub-qemu() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 
-	cd "${srcdir}/grub-${_pkgver}-qemu"
-
 	msg 'Run autogen.sh for QEMU build'
 	./autogen.sh
 
@@ -332,7 +321,8 @@ _build_grub-qemu() {
 
 _build_grub-ieee1275() {
 	msg 'Copy the source for building the IEEE1275 (OpenFirmware) part'
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-ieee1275"
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-ieee1275"
+	cd "${srcdir}/grub-${pkgver}-ieee1275"
 
 	msg 'Unset all compiler FLAGS for IEEE1275 (OpenFirmware) build'
 	unset CFLAGS
@@ -341,8 +331,6 @@ _build_grub-ieee1275() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 
-	cd "${srcdir}/grub-${_pkgver}-ieee1275"
-
 	msg 'Run autogen.sh for IEEE1275 (OpenFirmware) build'
 	./autogen.sh
 
@@ -377,7 +365,8 @@ _build_grub-ieee1275() {
 
 _build_grub-libreboot() {
 	msg 'Copy the source for building the Libreboot part'
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-libreboot"
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-libreboot"
+	cd "${srcdir}/grub-${pkgver}-libreboot"
 
 	msg 'Unset all compiler FLAGS for Libreboot build'
 	unset CFLAGS
@@ -386,8 +375,6 @@ _build_grub-libreboot() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 
-	cd "${srcdir}/grub-${_pkgver}-libreboot"
-
 	msg 'Run autogen.sh for Libreboot build'
 	./autogen.sh
 
@@ -422,7 +409,8 @@ _build_grub-libreboot() {
 
 _build_grub-multiboot() {
 	msg 'Copy the source for building the Multiboot part'
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-multiboot"
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-multiboot"
+	cd "${srcdir}/grub-${pkgver}-multiboot"
 
 	msg 'Unset all compiler FLAGS for Multiboot build'
 	unset CFLAGS
@@ -431,8 +419,6 @@ _build_grub-multiboot() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 
-	cd "${srcdir}/grub-${_pkgver}-multiboot"
-
 	msg 'Run autogen.sh for Multiboot build'
 	./autogen.sh
 
@@ -467,7 +453,8 @@ _build_grub-multiboot() {
 
 _build_grub-emu() {
 	msg 'Copy the source for building the emu part'
-	cp -r "${srcdir}/grub-${_pkgver}/" "${srcdir}/grub-${_pkgver}-emu/"
+	cp -r "${srcdir}/grub-${pkgver}/" "${srcdir}/grub-${pkgver}-emu/"
+	cd "${srcdir}/grub-${pkgver}-emu"
 
 	msg 'Unset all compiler FLAGS for emu build'
 	unset CFLAGS
@@ -476,8 +463,6 @@ _build_grub-emu() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 
-	cd "${srcdir}/grub-${_pkgver}-emu"
-
 	msg 'Run autogen.sh for emu build'
 	./autogen.sh
 
@@ -513,7 +498,8 @@ _build_grub-emu() {
 
 _build_grub-uboot() {
 	msg "Copy the source for building the U-Boot part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot"
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-uboot"
+	cd "${srcdir}/grub-${pkgver}-uboot"
 
 	msg 'Unset all compiler FLAGS for U-Boot build'
 	unset CFLAGS
@@ -522,8 +508,6 @@ _build_grub-uboot() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 
-	cd "${srcdir}/grub-${_pkgver}-uboot"
-
 	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
 	#       ' grub-core/loader/arm/linux.c
 
@@ -560,7 +544,7 @@ _build_grub-uboot() {
 }
 
 build() {
-	cd "${srcdir}/grub-${_pkgver}/"
+	cd "${srcdir}/grub-${pkgver}/"
 
 	if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]] || [[ "${CARCH}" = 'armv7h' ]]; then
 		msg "Build grub ${_EFI_ARCH} EFI stuff"
@@ -612,7 +596,7 @@ build() {
 }
 
 _package_grub-efi() {
-	cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/"
+	cd "${srcdir}/grub-${pkgver}-efi-${_EFI_ARCH}/"
 
 	msg "Run make install for ${_EFI_ARCH} EFI build"
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -624,7 +608,7 @@ _package_grub-efi() {
 }
 
 #_package_grub-xen() {
-#	cd "${srcdir}/grub-${_pkgver}-xen-${_XEN_ARCH}/"
+#	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
@@ -636,7 +620,7 @@ _package_grub-efi() {
 #}
 
 _package_grub-bios() {
-	cd "${srcdir}/grub-${_pkgver}-bios/"
+	cd "${srcdir}/grub-${pkgver}-bios/"
 
 	msg 'Run make install for BIOS build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -648,7 +632,7 @@ _package_grub-bios() {
 }
 
 _package_grub-qemu() {
-	cd "${srcdir}/grub-${_pkgver}-qemu/"
+	cd "${srcdir}/grub-${pkgver}-qemu/"
 
 	msg 'Run make install for QEMU build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -660,7 +644,7 @@ _package_grub-qemu() {
 }
 
 _package_grub-ieee1275() {
-	cd "${srcdir}/grub-${_pkgver}-ieee1275/"
+	cd "${srcdir}/grub-${pkgver}-ieee1275/"
 
 	msg 'Run make install for IEEE1275 (OpenFirmware) build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -672,7 +656,7 @@ _package_grub-ieee1275() {
 }
 
 _package_grub-libreboot() {
-	cd "${srcdir}/grub-${_pkgver}-libreboot/"
+	cd "${srcdir}/grub-${pkgver}-libreboot/"
 
 	msg 'Run make install for Libreboot build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -684,7 +668,7 @@ _package_grub-libreboot() {
 }
 
 _package_grub-multiboot() {
-	cd "${srcdir}/grub-${_pkgver}-multiboot/"
+	cd "${srcdir}/grub-${pkgver}-multiboot/"
 
 	msg 'Run make install for Multiboot build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -696,7 +680,7 @@ _package_grub-multiboot() {
 }
 
 _package_grub-emu() {
-	cd "${srcdir}/grub-${_pkgver}-emu/"
+	cd "${srcdir}/grub-${pkgver}-emu/"
 
 	msg 'Run make install for emu build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -708,7 +692,7 @@ _package_grub-emu() {
 }
 
 _package_grub-uboot() {
-	cd "${srcdir}/grub-${_pkgver}-uboot/"
+	cd "${srcdir}/grub-${pkgver}-uboot/"
 
 	msg 'Run make install for U-Boot build'
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
@@ -735,7 +719,7 @@ package_grub() {
 		             'sdl: For grub-emu SDL support')
 	fi
 
-	cd "${srcdir}/grub-${_pkgver}/"
+	cd "${srcdir}/grub-${pkgver}/"
 
 	if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]] || [[ "${CARCH}" = 'armv7h' ]]; then	
 		msg "Package grub ${_EFI_ARCH} EFI stuff"
@@ -793,9 +777,9 @@ package_grub-am335x_bone() {
 	             '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"
+	cp -r "${srcdir}/grub-${pkgver}-uboot" "${srcdir}/grub-${pkgver}-uboot_am335x-bone"
 
-	cd "${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}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
@@ -827,9 +811,9 @@ package_grub-omap3_beagle() {
 	             '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"
+	cp -r "${srcdir}/grub-${pkgver}-uboot" "${srcdir}/grub-${pkgver}-uboot_omap3_beagle"
 
-	cd "${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}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
@@ -861,9 +845,9 @@ package_grub-omap3_beagle_xm() {
 	             '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"
+	cp -r "${srcdir}/grub-${pkgver}-uboot" "${srcdir}/grub-${pkgver}-uboot_omap3_beagle_xm"
 
-	cd "${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}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
@@ -895,9 +879,9 @@ package_grub-omap3_beagle_xm_ab() {
 	             '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"
+	cp -r "${srcdir}/grub-${pkgver}-uboot" "${srcdir}/grub-${pkgver}-uboot_omap3_beagle_xm_ab"
 
-	cd "${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}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
@@ -928,9 +912,9 @@ package_grub-udoo() {
 	             '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"
+	cp -r "${srcdir}/grub-${pkgver}-uboot" "${srcdir}/grub-${pkgver}-uboot_udoo"
 
-	cd "${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}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"