Mon Apr 23 00:01:26 UTC 2012

4 files changed, 40 insertions, 22 deletions

diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index df7449cba..cf1afc868 100644
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
-_grub_bzr_rev="4169"
-_pkgver="2.00~beta3"
+_grub_bzr_rev="4232"
+_pkgver="2.00~beta4"
 
 _grub_lua_ver=24
 _grub_gpxe_ver=12
@@ -12,8 +12,8 @@ _grub_915_ver=9
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
-pkgver=2.00beta3
-pkgrel=1.1
+pkgver=2.00beta4
+pkgrel=1
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -30,23 +30,24 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz
         'parabola_grub_mkconfig_fixes.patch'
         'grub.default'
         'grub.cfg'
-        '20_memtest86+')
+        '20_memtest86+'
+        'grub-install.fix')
 
 noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
            "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
            "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
            "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
 
-sha1sums=('96bfdf4d53767faaf2c744ee82d4d703e4b672a2'
+sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11'
           '89290031b974780c6df76893836d2477d4add895'
           'b04994c005910b4bf123f034b30109d5c8d6fd86'
           'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
           'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
-          'bf8e692c3920f0cf125ee77f14b8432133cae84d'
+          '31aa740fc225b3f3ed4917843038f9e8658a71be'
           '348b148d5183825f31a3d24a7ebf2d6a709f4e6a'
-          '6f0870673b9f994163326a416432aee7eacdbfc5'
-          'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
-
+          '22063a0c7a779997a7763123a3064f7c1586674b'
+          'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
+          '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7')
 _build_grub2-common_and_bios() {
 
 	## copy the source for building the common/bios package
@@ -57,6 +58,10 @@ _build_grub2-common_and_bios() {
 	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
 	echo
 
+	## upstream grub-install fix 
+	## http://lists.gnu.org/archive/html/help-grub/2012-04/msg00096.html
+	patch -Np0 -i "${srcdir}/grub-install.fix"
+	
 	## add the grub-extra sources
 	export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/"
 	install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras"
@@ -188,7 +193,7 @@ build() {
 
 package_grub2-common() {
 
-	pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms"
+	pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms (Parabola rebranded)"
 	depends=('xz' 'freetype2' 'gettext' 'device-mapper' 'fuse' 'sh')
 	conflicts=('grub')
 	backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
diff --git a/libre/grub2/grub-install.fix b/libre/grub2/grub-install.fix
new file mode 100644
index 000000000..29e74bd44
--- /dev/null
+++ b/libre/grub2/grub-install.fix
@@ -0,0 +1,11 @@
+=== modified file 'grub-core/kern/emu/hostdisk.c'
+--- grub-core/kern/emu/hostdisk.c       2012-04-18 21:48:52 +0000
++++ grub-core/kern/emu/hostdisk.c       2012-04-19 18:35:06 +0000
+@@ -1081,7 +1081,7 @@
+     {
+       int fd;
+       grub_disk_addr_t max = ~0ULL;
+-      fd = open_device (disk, sector, O_RDONLY, &max);
++      fd = open_device (disk, sector, O_WRONLY, &max);
+       if (fd < 0)
+        return grub_errno;
diff --git a/libre/grub2/grub.cfg b/libre/grub2/grub.cfg
index 4f5a21991..9fffc564d 100644
--- a/libre/grub2/grub.cfg
+++ b/libre/grub2/grub.cfg
@@ -69,7 +69,7 @@ set timeout=5
 ### END /etc/grub.d/00_header ###
 
 ### BEGIN /etc/grub.d/10_linux ###
-menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabolagnu/linux-libre --class gnu-linux --class gnu --class os {
+menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabola --class gnu-linux --class gnu --class os {
 	load_video
 	set gfxpayload=keep
 	insmod gzio
@@ -86,7 +86,7 @@ menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabolagnu/linux
 	echo	'Loading initial ramdisk ...'
 	initrd	/initramfs-linux-libre.img
 }
-menuentry 'Parabola GNU/Linux-libre, with Linux libre Fallback' --class parabolagnu/linux-libre --class gnu-linux --class gnu --class os {
+menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabola --class gnu-linux --class gnu --class os {
 	load_video
 	set gfxpayload=keep
 	insmod gzio
diff --git a/libre/grub2/parabola_grub_mkconfig_fixes.patch b/libre/grub2/parabola_grub_mkconfig_fixes.patch
index d199dc86a..19022aec6 100644
--- a/libre/grub2/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub2/parabola_grub_mkconfig_fixes.patch
@@ -1,5 +1,5 @@
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index df3b733..65a7fff 100644
+index 516be86..5f37db2 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -213,6 +213,8 @@ export GRUB_DEFAULT \
@@ -31,7 +31,7 @@ index 765bfdc..b148558 100644
  gfxterm=0;
  for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 8c75fab..0d4a137 100644
+index 14402e8..64c9bb5 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -31,7 +31,7 @@
@@ -71,7 +71,7 @@ index 8c75fab..0d4a137 100644
    sed "s/^/$submenu_indentation/" << EOF
  	echo	'$message'
  	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -181,13 +184,29 @@ while [ "x$list" != "x" ] ; do
+@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do
    alt_version=`echo $version | sed -e "s,\.old$,,g"`
    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
  
@@ -94,15 +94,17 @@ index 8c75fab..0d4a137 100644
    for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
  	   "initrd-${version}" "initramfs-${version}.img" \
  	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
- 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do
  	   "initramfs-genkernel-${version}" \
--	   "initramfs-genkernel-${alt_version}"; do
-+	   "initramfs-genkernel-${alt_version}" \
+ 	   "initramfs-genkernel-${alt_version}" \
+ 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
++	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
 +	   "${initrd_arch}.img" ; do
      if test -e "${dirname}/${i}" ; then
        initrd="$i"
        break
-@@ -215,6 +234,22 @@ while [ "x$list" != "x" ] ; do
+@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do
      linux_root_device_thisversion=${GRUB_DEVICE}
    fi
  
@@ -125,7 +127,7 @@ index 8c75fab..0d4a137 100644
    if [ "x$is_first_entry" = xtrue ]; then
      linux_entry "${OS}" "${version}" simple \
      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -228,8 +263,11 @@ while [ "x$list" != "x" ] ; do
+@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do
      echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
    fi
  
@@ -137,7 +139,7 @@ index 8c75fab..0d4a137 100644
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
      linux_entry "${OS}" "${version}" recovery \
                  "single ${GRUB_CMDLINE_LINUX}"
-@@ -241,8 +279,10 @@ done
+@@ -252,8 +290,10 @@ done
  
  # If at least one kernel was found, then we need to
  # add a closing '}' for the submenu command.