[arch-commits] Commit in grub2/trunk (3 files)

Ronald van Haren ronald at archlinux.org
Sun Apr 22 14:30:44 UTC 2012


    Date: Sunday, April 22, 2012 @ 10:30:44
  Author: ronald
Revision: 156658

upgpkg: grub2 1:2.00beta4-1

update to 2.00beta4

Added:
  grub2/trunk/grub-install.fix
Modified:
  grub2/trunk/PKGBUILD
  grub2/trunk/archlinux_grub_mkconfig_fixes.patch

-------------------------------------+
 PKGBUILD                            |   21 +++++++++++++--------
 archlinux_grub_mkconfig_fixes.patch |   20 +++++++++++---------
 grub-install.fix                    |   11 +++++++++++
 3 files changed, 35 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-22 14:30:24 UTC (rev 156657)
+++ PKGBUILD	2012-04-22 14:30:44 UTC (rev 156658)
@@ -1,8 +1,8 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
-_grub_bzr_rev="4169"
-_pkgver="2.00~beta3"
+_grub_bzr_rev="4232"
+_pkgver="2.00~beta4"
 
 _grub_lua_ver=24
 _grub_gpxe_ver=12
@@ -11,7 +11,7 @@
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
-pkgver=2.00beta3
+pkgver=2.00beta4
 pkgrel=1
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64')
@@ -29,23 +29,24 @@
         'archlinux_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'
-          'cdace8067562fab04aaacac8d99a4ea612fa0c5b'
+          '26e4e946190bea1f03632658cf08ba90e11dec57'
           'a76b251b110c9c2d49d2340e4ae932db13ad75bd'
           'fd422806c87905f9cabe1f0dc13e544e5fc09e53'
-          'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
-
+          'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
+          '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7')
 _build_grub2-common_and_bios() {
 
 	## copy the source for building the common/bios package
@@ -56,6 +57,10 @@
 	patch -Np1 -i "${srcdir}/archlinux_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"

Modified: archlinux_grub_mkconfig_fixes.patch
===================================================================
--- archlinux_grub_mkconfig_fixes.patch	2012-04-22 14:30:24 UTC (rev 156657)
+++ archlinux_grub_mkconfig_fixes.patch	2012-04-22 14:30:44 UTC (rev 156658)
@@ -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 @@
  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
 @@ -87,6 +87,8 @@ linux_entry ()
@@ -62,7 +62,7 @@
    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}"
  
@@ -85,15 +85,17 @@
    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
  
@@ -116,7 +118,7 @@
    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
  
@@ -128,7 +130,7 @@
    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.

Added: grub-install.fix
===================================================================
--- grub-install.fix	                        (rev 0)
+++ grub-install.fix	2012-04-22 14:30:44 UTC (rev 156658)
@@ -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;




More information about the arch-commits mailing list