[arch-commits] Commit in grub2/trunk (4 files)
Ronald van Haren
ronald at archlinux.org
Tue May 3 15:18:30 UTC 2011
Date: Tuesday, May 3, 2011 @ 11:18:29
Author: ronald
Revision: 122264
upgpkg: grub2 1.99~rc2.r3238-1
rc2 contained some merge errors, these are corrected in the current bzr snapshot; fix mkconfig patch to handle initrd-less kernels correctly (not-tested)
Modified:
grub2/trunk/PKGBUILD
grub2/trunk/archlinux_grub2_mkconfig_fixes.patch
grub2/trunk/fix_stack_pointer_handling_16_relocator.patch
grub2/trunk/grub2.install
-----------------------------------------------+
PKGBUILD | 17 ++--
archlinux_grub2_mkconfig_fixes.patch | 82 +++++++++++-------------
fix_stack_pointer_handling_16_relocator.patch | 16 ----
grub2.install | 43 ++++++------
4 files changed, 68 insertions(+), 90 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-03 14:55:59 UTC (rev 122263)
+++ PKGBUILD 2011-05-03 15:18:29 UTC (rev 122264)
@@ -3,7 +3,7 @@
# The src pkg includes grub2_bzr_export.sh to create newer grub-extras snapshots. Modify the paths in it accordingly.
-# _grub2_rev=3229
+# _grub2_rev=3238
_grub2_lua_ver=20
_grub2_gpxe_ver=12
@@ -12,7 +12,7 @@
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase="grub2"
-pkgver='1.99~rc2'
+pkgver='1.99~rc2.r3238'
pkgrel=1
url="http://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
@@ -20,13 +20,13 @@
makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper')
options=(strip purge docs zipman !emptydirs)
-source=("http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
+# "http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
+source=("ftp://ftp.archlinux.org/other/grub2/grub-${pkgver}.tar.xz"
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz"
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz"
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz"
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz"
'archlinux_grub2_mkconfig_fixes.patch'
- 'fix_stack_pointer_handling_16_relocator.patch'
'grub.default'
'grub.cfg'
'20_memtest86+'
@@ -37,13 +37,12 @@
"grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz"
"grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz")
-sha1sums=('786e7edb849e1bd2be917f574da92ebefd0e1915'
+sha1sums=('e5ae00ae7dee95a64599fdf7cf89c8518aa2de5c'
'9f2dbf7a3faab24ca92266400aa513fecd3895c8'
'b04994c005910b4bf123f034b30109d5c8d6fd86'
'e0c1a97770cc23226cf4535c029ef50b17f67974'
'8bcaed545956bb33581e1b97ac96a2c3717ec793'
- '2b0c48b0121c47f0fc97871a08460420b4753b08'
- '0d28fb02aec6a5fc5763482733ca07385a69aaaa'
+ '2bd3673db5616ff528ede82df62023e79b86c1cc'
'e1477db3700b27b5e5ad3d8fa43028555204759b'
'8948d89537c12a4202df7c001e65a77030bbe5a3'
'82a27eca5277218cf57c6c5767e0b17a72f62229'
@@ -69,8 +68,6 @@
## Apply Archlinux specific fixes to enable grub2-mkconfig detect Arch kernels and initramfs
cd ${srcdir}/grub2_bios-${pkgver}
patch -Np1 -i ${srcdir}/archlinux_grub2_mkconfig_fixes.patch
- # Patch to fix memtest reboot issue https://bugs.archlinux.org/task/22993
- patch -Np1 -i ${srcdir}/fix_stack_pointer_handling_16_relocator.patch
# add the grub-extra sources
export GRUB_CONTRIB=${srcdir}/grub2_bios-${pkgver}/grub2-extras/
@@ -141,7 +138,7 @@
package_grub2-common() {
pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms"
install="grub2.install"
- depends=('xz' 'freetype2' 'device-mapper' 'gettext')
+ depends=('xz' 'freetype2' 'device-mapper' 'gettext' 'texinfo')
conflicts=('grub')
backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
cd ${srcdir}/grub2_bios-${pkgver}
Modified: archlinux_grub2_mkconfig_fixes.patch
===================================================================
--- archlinux_grub2_mkconfig_fixes.patch 2011-05-03 14:55:59 UTC (rev 122263)
+++ archlinux_grub2_mkconfig_fixes.patch 2011-05-03 15:18:29 UTC (rev 122264)
@@ -1,21 +1,7 @@
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index afc66f8..c80f7bf 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -252,6 +252,8 @@ export GRUB_DEFAULT \
- GRUB_THEME \
- GRUB_GFXPAYLOAD_LINUX \
- GRUB_DISABLE_OS_PROBER \
-+ GRUB_COLOR_NORMAL \
-+ GRUB_COLOR_HIGHLIGHT \
- GRUB_INIT_TUNE \
- GRUB_SAVEDEFAULT \
- GRUB_BADRAM
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 9da1511..6251bca 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -100,6 +100,14 @@ cat <<EOF
+diff -Nur a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+--- a/util/grub.d/00_header.in 2011-04-06 13:14:27.000000000 +0200
++++ b/util/grub.d/00_header.in 2011-04-26 09:23:02.371574484 +0200
+@@ -100,6 +100,14 @@
EOF
@@ -30,11 +16,10 @@
serial=0;
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 1dbcad9..7c22cc0 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -31,8 +31,8 @@ CLASS="--class gnu-linux --class gnu --class os"
+diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+--- a/util/grub.d/10_linux.in 2011-04-18 23:18:49.000000000 +0200
++++ b/util/grub.d/10_linux.in 2011-04-26 10:16:54.397538449 +0200
+@@ -31,8 +31,8 @@
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU/Linux
else
@@ -45,7 +30,7 @@
fi
# loop-AES arranges things so that /dev/loop/X can be our root device, but
-@@ -48,7 +48,7 @@ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue"
+@@ -48,7 +48,7 @@
|| uses_abstraction "${GRUB_DEVICE}" lvm; then
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
else
@@ -54,7 +39,18 @@
fi
if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ]; then
-@@ -121,11 +121,11 @@ EOF
+@@ -65,7 +65,9 @@
+ version="$2"
+ recovery="$3"
+ args="$4"
+- if ${recovery} ; then
++ if [ -n "$5" ] ; then
++ title="$(gettext_quoted "%s, with Linux %s") $5"
++ elif ${recovery} ; then
+ title="$(gettext_quoted "%s, with Linux %s (recovery mode)")"
+ else
+ title="$(gettext_quoted "%s, with Linux %s")"
+@@ -121,11 +123,11 @@
case x`uname -m` in
xi?86 | xx86_64)
@@ -68,19 +64,7 @@
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done` ;;
esac
-@@ -139,16 +139,19 @@ while [ "x$list" != "x" ] ; do
- dirname=`dirname $linux`
- rel_dirname=`make_system_path_relative_to_its_root $dirname`
- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
-- alt_version=`echo $version | sed -e "s,\.old$,,g"`
-+ base_init=`echo $basename | sed -e "s,vmlinuz,kernel,g"`
-+ alt_version="${base_init}-fallback"
- linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-
- initrd=
-+
- for i in "initrd.img-${version}" "initrd-${version}.img" \
- "initrd-${version}" "initramfs-${version}.img" \
+@@ -148,7 +150,8 @@
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
"initramfs-genkernel-${version}" \
@@ -90,13 +74,27 @@
if test -e "${dirname}/${i}" ; then
initrd="$i"
break
-@@ -178,6 +181,9 @@ while [ "x$list" != "x" ] ; do
+@@ -178,6 +181,11 @@
linux_entry "${OS}" "${version}" false \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+ initrd="${alt_version}.img"
-+ linux_entry "${OS}" "${version} Fallback" false \
-+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++ if test -e "${dirname}/${basename/vmlinuz/kernel}-fallback.img"; then
++ initrd="${basename/vmlinuz/kernel}-fallback.img"
++ linux_entry "${OS}" "${version}" true \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" Fallback
++ fi
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
linux_entry "${OS}" "${version}" true \
"single ${GRUB_CMDLINE_LINUX}"
+diff -Nur a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+--- a/util/grub-mkconfig.in 2011-04-06 17:45:53.000000000 +0200
++++ b/util/grub-mkconfig.in 2011-04-26 09:23:02.371574484 +0200
+@@ -252,6 +252,8 @@
+ GRUB_THEME \
+ GRUB_GFXPAYLOAD_LINUX \
+ GRUB_DISABLE_OS_PROBER \
++ GRUB_COLOR_NORMAL \
++ GRUB_COLOR_HIGHLIGHT \
+ GRUB_INIT_TUNE \
+ GRUB_SAVEDEFAULT \
+ GRUB_BADRAM
Modified: fix_stack_pointer_handling_16_relocator.patch
===================================================================
--- fix_stack_pointer_handling_16_relocator.patch 2011-05-03 14:55:59 UTC (rev 122263)
+++ fix_stack_pointer_handling_16_relocator.patch 2011-05-03 15:18:29 UTC (rev 122264)
@@ -1,19 +1,3 @@
-diff --git a/ChangeLog b/ChangeLog
-index 083d22e..98d3b0e 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,11 @@
-+2011-04-21 Colin Watson <cjwatson at ubuntu.com>
-+
-+ Fix stack pointer handling in 16-bit relocator.
-+
-+ * grub-core/lib/i386/relocator16.S (grub_relocator16_start): Move
-+ grub_relocator16_sp to %esp rather than %ss, and zero-extend it.
-+ Fixes Ubuntu bug #683904.
-+
- 2011-04-20 Vladimir Serbinenko <phcoder at gmail.com>
-
- * configure.ac: Bump version to 1.99~rc2.
diff --git a/grub-core/lib/i386/relocator16.S b/grub-core/lib/i386/relocator16.S
index c3768f4..982415d 100644
--- a/grub-core/lib/i386/relocator16.S
Modified: grub2.install
===================================================================
--- grub2.install 2011-05-03 14:55:59 UTC (rev 122263)
+++ grub2.install 2011-05-03 15:18:29 UTC (rev 122264)
@@ -1,30 +1,29 @@
+infodir=usr/share/info
+filelist=(grub.info grub-dev.info)
+
post_install() {
+ if [ -f /boot/grub/grub.cfg.pacsave ]; then
+ echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
+ install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
+ fi
- if [ -f /boot/grub/grub.cfg.pacsave ]; then
- echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
- install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
- fi
+ echo -n "Generating grub.cfg.example config file... "
+ grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
+ echo "done."
- echo -n "Generating grub.cfg.example config file... "
- grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
- echo "done."
-
-cat << EOF
- An example config file is created at /boot/grub/grub.cfg.example
-
- For more information and additional config settings please see http://wiki.archlinux.org/index.php/GRUB2
-
-EOF
-
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
}
-
post_upgrade() {
-cat << EOF
- An example config file is created at /boot/grub/grub.cfg.example
-
- For more information and additional config settings please see http://wiki.archlinux.org/index.php/GRUB2
-
-EOF
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
}
+pre_remove() {
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
More information about the arch-commits
mailing list