Wed Jun 26 01:37:43 PDT 2013

3 files changed, 39 insertions, 170 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 21220a209..59c7dbe0a 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -3,23 +3,25 @@
 # Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
-## grub-extras lua and gpxe fail to build
+_GRUB_BZR_REV="5043"
+
+## grub-extras lua and gpxe fail to build with grub bzr rev 5043
 
 [[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
 [[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
 
 pkgname=grub
 pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
-pkgver=2.00
+pkgver=2.00.${_GRUB_BZR_REV}
 pkgrel=1
 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=('etc/default/grub' 'etc/grub.d/40_custom')
 install="${pkgname}.install"
 options=('!makeflags')
 
-conflicts=('grub-legacy' 'grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
 replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
 provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
 
@@ -28,51 +30,42 @@ makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
 depends=('sh' 'xz' 'gettext' 'device-mapper')
 optdepends=('freetype2: For grub-mkfont usage'
             'fuse: For grub-mount usage'
-            'dosfstools: For EFI support' 
+            'dosfstools: For grub-mkrescue FAT FS and EFI support' 
             'efibootmgr: For grub-install EFI support'
             'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
             'mtools: For grub-mkrescue FAT FS support')
 
-source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
-        '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
-        'grub-2.00-fix-docs.patch'
+# source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
+source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}"
         'parabola_grub_mkconfig_fixes.patch'
         '60_memtest86+'
-        'grub.default'
-        'grub.cfg')
+        'grub.default')
 
 for _DIR_ in 915resolution ntldr-img ; do
-	source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/")
+	source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
 done
 
-source+=("grub-extras-lua::bzr+bzr://bzr.savannah.gnu.org/grub-extras/lua/#revision=24"
-         "grub-extras-gpxe::bzr+bzr://bzr.savannah.gnu.org/grub-extras/gpxe/#revision=13")
-
-sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
-          'b68565bc155094bade390c257c3f31bc55ae244b'
-          '1dc08391bb13f8e23faa21a76cc4cc4b25467702'
-          'c631ec04d458c60a3ceffe60d2d1806d54554d9c'
+# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
+sha1sums=('SKIP'
+          '513172d91d1a2e2cda7c0a744c766d5868cb28bf'
           '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
           '06b926320cb2add6c157d59d46e553b89dd3aa03'
-          '662ec5f0d44122b66666a788387ec69389295b2c'
-          'SKIP'
-          'SKIP'
           'SKIP'
           'SKIP')
 
 _build_grub-common_and_bios() {
 	
 	## Copy the source for building the common/bios package
-	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-bios-${pkgver}"
-	cd "${srcdir}/grub-bios-${pkgver}/"
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios"
+	cd "${srcdir}/grub-${pkgver}-bios/"
 	
 	## Add the grub-extra sources
-	export GRUB_CONTRIB="${srcdir}/grub-bios-${pkgver}/grub-extras/"
+	export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/"
 	
-	install -d "${srcdir}/grub-bios-${pkgver}/grub-extras"
-	for _DIR_ in 915resolution ntldr-img lua gpxe ; do
-		cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}"
+	install -d "${srcdir}/grub-${pkgver}-bios/grub-extras"
+	for _DIR_ in 915resolution ntldr-img ; do
+		cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}"
 	done
 	
 	## Unset all compiler FLAGS for bios build
@@ -83,11 +76,11 @@ _build_grub-common_and_bios() {
 	unset MAKEFLAGS
 	
 	## Start the actual build process
-	cd "${srcdir}/grub-bios-${pkgver}/"
+	cd "${srcdir}/grub-${pkgver}-bios/"
 	./autogen.sh
 	echo
 	
-	CFLAGS="-fno-stack-protector" ./configure \
+	./configure \
 		--with-platform="pc" \
 		--target="i386" \
 		"${_EFIEMU}" \
@@ -117,15 +110,15 @@ _build_grub-common_and_bios() {
 _build_grub-efi() {
 	
 	## Copy the source for building the efi package
-	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-efi-${pkgver}"
-	cd "${srcdir}/grub-efi-${pkgver}/"
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi"
+	cd "${srcdir}/grub-${pkgver}-efi/"
 	
-	export GRUB_CONTRIB="${srcdir}/grub-efi-${pkgver}/grub-extras/"
+	# export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-efi/grub-extras/"
 	
-	install -d "${srcdir}/grub-efi-${pkgver}/grub-extras/"
-	for _DIR_ in lua gpxe ; do
-		cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}"
-	done
+	# install -d "${srcdir}/grub-${pkgver}-efi/grub-extras/"
+	# for _DIR_ in lua gpxe ; do
+	#	cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}"
+	# done
 	
 	## Unset all compiler FLAGS for efi build
 	unset CFLAGS
@@ -134,7 +127,7 @@ _build_grub-efi() {
 	unset LDFLAGS
 	unset MAKEFLAGS
 	
-	cd "${srcdir}/grub-efi-${pkgver}/"
+	cd "${srcdir}/grub-${pkgver}-efi/"
 	./autogen.sh
 	echo
 	
@@ -177,14 +170,6 @@ build() {
 	
 	cd "${srcdir}/grub-${pkgver}/"
 	
-	## Fix compiling with gcc48
-	patch -Np1 -i "${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch"
-	echo
-	
-	## Fix docs compiling
-	patch -Np1 -i "${srcdir}/grub-2.00-fix-docs.patch"
-	echo
-	
 	## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
 	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
 	echo
@@ -208,7 +193,7 @@ build() {
 
 _package_grub-common_and_bios() {
 	
-	cd "${srcdir}/grub-bios-${pkgver}/"
+	cd "${srcdir}/grub-${pkgver}-bios/"
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
 	echo
 	
@@ -223,15 +208,12 @@ _package_grub-common_and_bios() {
 	## Install /etc/default/grub (used by grub-mkconfig)
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
 	
-	## Install grub.cfg for backup array
-	install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
-	
 }
 
 _package_grub-efi() {
 	
-	cd "${srcdir}/grub-efi-${pkgver}/"
-	make DESTDIR="${pkgdir}/" install
+	cd "${srcdir}/grub-${pkgver}-efi/"
+	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
 	echo
 	
 	## remove gdb debugging related files
diff --git a/libre/grub/grub_bzr_export.sh b/libre/grub/grub_bzr_export.sh
deleted file mode 100644
index ff8f99ecc..000000000
--- a/libre/grub/grub_bzr_export.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-
-## For actual repos
-
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution
-
-## For launchpad mirror
-
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-lua lua
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-gpxe gpxe
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-ntldr-img ntldr-img
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-915resolution 915resolution
-
-## grub-extras zfs is integrated into grub bzr main repo and is no longer needed separately.
-
-_WD="${PWD}/"
-_OUTPUT_DIR="${_WD}/"
-
-_ACTUAL_PKGVER="2.00"
-
-_GRUB_BZR_REPO_DIR="${_WD}/grub_mainline_BZR/"
-_GRUB_BZR_EXP_REPO_DIR="${_WD}/grub_experimental_BZR/"
-_GRUB_EXTRAS_REPOS_DIR="${_WD}/grub_extras_BZR/"
-
-_MAIN_SNAPSHOT() {
-	
-	cd "${_GRUB_BZR_REPO_DIR}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB_BZR_REPO_DIR})"
-	bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar"
-	echo
-	
-	cd "${_OUTPUT_DIR}/"
-	
-	xz -9 "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar"
-	echo
-	
-}
-
-_EXP_SNAPSHOT() {
-	
-	cd "${_GRUB_BZR_EXP_REPO_DIR}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB_BZR_EXP_REPO_DIR})"
-	bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar"
-	echo
-	
-	cd "${_OUTPUT_DIR}/"
-	
-	xz -9 "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar"
-	echo
-	
-}
-
-_EXTRAS_SNAPSHOT() {
-	
-	cd "${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME})"
-	bzr export --root="${_GRUB_EXTRAS_NAME}" --format="tar" "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar"
-	echo
-	
-	cd "${_OUTPUT_DIR}/"
-	echo
-	
-	xz -9 "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar"
-	echo
-	
-}
-
-echo
-
-set -x -e
-
-echo
-
-_MAIN_SNAPSHOT
-
-echo
-
-# _EXP_SNAPSHOT
-
-echo
-
-_GRUB_EXTRAS_NAME="lua"
-_EXTRAS_SNAPSHOT
-
-# _GRUB_EXTRAS_NAME="gpxe"
-# _EXTRAS_SNAPSHOT
-
-_GRUB_EXTRAS_NAME="ntldr-img"
-_EXTRAS_SNAPSHOT
-
-_GRUB_EXTRAS_NAME="915resolution"
-_EXTRAS_SNAPSHOT
-
-echo
-
-set +x +e
-
-echo
-
-unset _WD
-unset _OUTPUT_DIR
-unset _GRUB_BZR_REPO_DIR
-unset _GRUB_EXTRAS_REPOS_DIR
-unset _GRUB_EXTRAS_NAME
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index 5324afa01..fbcca19ec 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 516be86..5f37db2 100644
+index 8decc1d..170047f 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -213,6 +213,8 @@ export GRUB_DEFAULT \
+@@ -212,6 +212,8 @@ export GRUB_DEFAULT \
    GRUB_THEME \
    GRUB_GFXPAYLOAD_LINUX \
    GRUB_DISABLE_OS_PROBER \
@@ -12,10 +12,10 @@ index 516be86..5f37db2 100644
    GRUB_SAVEDEFAULT \
    GRUB_ENABLE_CRYPTODISK \
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 765bfdc..b148558 100644
+index 2c4bb0a..c7120d2 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
-@@ -115,6 +115,14 @@ cat <<EOF
+@@ -125,6 +125,14 @@ cat <<EOF
  
  EOF
  
@@ -64,7 +64,7 @@ index 14402e8..e85f7d6 100644
    fi      
 -  if [ x$type != xrecovery ] ; then
 +  if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then
-       save_default_entry | sed -e "s/^/\t/"
+       save_default_entry | grub_add_tab
    fi
  
 @@ -132,7 +140,8 @@ linux_entry ()
@@ -75,7 +75,7 @@ index 14402e8..e85f7d6 100644
 +
 +  message="$(gettext_printf "Loading Linux %s ..." "${version}")"
    sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$message'
+ 	echo	'$(echo "$message" | grub_quote)'
  	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
 @@ -190,7 +199,22 @@ while [ "x$list" != "x" ] ; do
    alt_version=`echo $version | sed -e "s,\.old$,,g"`