upgpkg: grub 2:2.02-1

new upstream release

git-svn-id: file:///srv/repos/svn-packages/svn@294837 eb2447ed-0c53-47e4-bac8-5bc4a241df78

1 files changed, 33 insertions, 44 deletions

diff --git a/PKGBUILD b/PKGBUILD
index db4b7f7a853a..c2801efeabb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer : Christian Hesse <mail@eworm.de>
 # Maintainer : Ronald van Haren <ronald.archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
 ## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable
@@ -8,8 +9,6 @@ _IA32_EFI_IN_ARCH_X64="1"
 ## "1" to enable EMU build, "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"
@@ -22,13 +21,15 @@ _UNIFONT_VER="9.0.06"
 
 pkgname="grub"
 pkgdesc="GNU GRand Unified Bootloader (2)"
-pkgver=2.02.rc2
+pkgver=2.02
 pkgrel=1
-epoch=1
+epoch=2
 url="https://www.gnu.org/software/grub/"
 arch=('x86_64' 'i686')
 license=('GPL3')
-backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
+backup=('boot/grub/grub.cfg'
+        'etc/default/grub'
+        'etc/grub.d/40_custom')
 install="${pkgname}.install"
 options=('!makeflags')
 
@@ -53,19 +54,20 @@ if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
                  'sdl: For grub-emu SDL support')
 fi
 
-validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33')  # Paul Hardy <unifoundry@unifoundry.com>
+validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209'  # Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
+              '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>
 
-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}
         '0002-intel-ucode.patch'
         '0003-10_linux-detect-archlinux-initramfs.patch'
         '0004-add-GRUB_COLOR_variables.patch'
         'grub.default'
         'grub.cfg')
 
-sha256sums=('SKIP'
+sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
+            'SKIP'
             'SKIP'
             '4246c4773ed70f78a7e27ff1118fd257a280d1102200265ad5d58bb2011195ef'
             'SKIP'
@@ -75,13 +77,8 @@ sha256sums=('SKIP'
             'df764fbd876947dea973017f95371e53833bf878458140b09f0b70d900235676'
             'c5e4f3836130c6885e9273c21f057263eba53f4b7c0e2f111f6e5f2e487a47ad')
 
-_pkgver() {
-	cd "${srcdir}/grub-${_pkgver}/"
-	echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g'
-}
-
 prepare() {
-	cd "${srcdir}/grub-${_pkgver}/"
+	cd "${srcdir}/grub-${pkgver}/"
 
 	msg "Patch to load Intel microcode"
 	patch -Np1 -i "${srcdir}/0002-intel-ucode.patch"
@@ -97,26 +94,23 @@ prepare() {
 	echo
 
 	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 "Fix mkinitcpio 'rw' FS#36275"
-	sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
+	sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
 
 	msg "Fix OS naming FS#33393"
-	sed 's|GNU/Linux|Linux|' -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|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in"
 
 	msg "Pull in latest language files"
 	./linguas.sh
 	echo
 
 	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"
 }
 
 _build_grub-common_and_bios() {
@@ -128,13 +122,13 @@ _build_grub-common_and_bios() {
 	fi
 
 	msg "Copy the source for building the bios part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios"
-	cd "${srcdir}/grub-${_pkgver}-bios/"
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios"
+	cd "${srcdir}/grub-${pkgver}-bios/"
 
 	msg "Add the grub-extra sources for bios build"
-	install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras"
-	cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-bios/grub-extras/915resolution"
-	export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-bios/grub-extras/"
+	install -d "${srcdir}/grub-${pkgver}-bios/grub-extras"
+	cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${pkgver}-bios/grub-extras/915resolution"
+	export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/"
 
 	msg "Unset all compiler FLAGS for bios build"
 	unset CFLAGS
@@ -143,8 +137,6 @@ _build_grub-common_and_bios() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 
-	cd "${srcdir}/grub-${_pkgver}-bios/"
-
 	msg "Run autogen.sh for bios build"
 	./autogen.sh
 	echo
@@ -182,8 +174,8 @@ _build_grub-common_and_bios() {
 
 _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}"
-	cd "${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
@@ -192,8 +184,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
 	echo
@@ -231,7 +221,8 @@ _build_grub-efi() {
 
 _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
@@ -240,8 +231,6 @@ _build_grub-emu() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 
-	cd "${srcdir}/grub-${_pkgver}-emu/"
-
 	msg "Run autogen.sh for emu build"
 	./autogen.sh
 	echo
@@ -279,7 +268,7 @@ _build_grub-emu() {
 }
 
 build() {
-	cd "${srcdir}/grub-${_pkgver}/"
+	cd "${srcdir}/grub-${pkgver}/"
 
 	msg "Build grub bios stuff"
 	_build_grub-common_and_bios
@@ -303,7 +292,7 @@ build() {
 }
 
 _package_grub-common_and_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
@@ -322,7 +311,7 @@ _package_grub-common_and_bios() {
 }
 
 _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
@@ -335,7 +324,7 @@ _package_grub-efi() {
 }
 
 _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
@@ -348,7 +337,7 @@ _package_grub-emu() {
 }
 
 package() {
-	cd "${srcdir}/grub-${_pkgver}/"
+	cd "${srcdir}/grub-${pkgver}/"
 
 	msg "Package grub ${_EFI_ARCH} efi stuff"
 	_package_grub-efi