[arch-commits] Commit in grub2/trunk (6 files)
Ronald van Haren
ronald at archlinux.org
Fri Apr 22 11:24:15 UTC 2011
Date: Friday, April 22, 2011 @ 07:24:14
Author: ronald
Revision: 120335
upgpkg: grub2 1.99~rc2-1
update to latest version; fix memtest reboot bug; handle initrd-less kernels (not tested); some other minor bugs
Added:
grub2/trunk/fix_stack_pointer_handling_16_relocator.patch
grub2/trunk/grub2_bzr_export.sh
Modified:
grub2/trunk/PKGBUILD
grub2/trunk/archlinux_grub2_mkconfig_fixes.patch
grub2/trunk/grub.cfg
grub2/trunk/grub.default
-----------------------------------------------+
PKGBUILD | 60 ++++-----
archlinux_grub2_mkconfig_fixes.patch | 51 ++++----
fix_stack_pointer_handling_16_relocator.patch | 29 ++++
grub.cfg | 149 ++++++++++++++++++++----
grub.default | 17 +-
grub2_bzr_export.sh | 103 ++++++++++++++++
6 files changed, 324 insertions(+), 85 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-04-22 11:15:56 UTC (rev 120334)
+++ PKGBUILD 2011-04-22 11:24:14 UTC (rev 120335)
@@ -1,49 +1,53 @@
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Keshav P R <skodabenz at rocketmail dot com>
-# _grub2_rev=3072
+# The src pkg includes grub2_bzr_export.sh to create newer grub-extras snapshots. Modify the paths in it accordingly.
-_grub2_lua_ver=19
+# _grub2_rev=3229
+
+_grub2_lua_ver=20
_grub2_gpxe_ver=12
-_grub2_ntldr_ver=13
-_grub2_915_ver=6
+_grub2_ntldr_ver=17
+_grub2_915_ver=7
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase="grub2"
-pkgver='1.99~rc1'
-pkgrel=3
+pkgver='1.99~rc2'
+pkgrel=1
url="http://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper')
options=(strip purge docs zipman !emptydirs)
-source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz"
+source=("http://alpha.gnu.org/gnu/grub/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+'
- '05_archtheme')
+ 'grub2_bzr_export.sh')
noextract=("grub2_extras_lua_r${_grub2_lua_ver}.tar.xz"
"grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz"
"grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz"
"grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz")
-sha1sums=('866b6979974ad7209d236cb4e1819039f0bd1c6d'
- 'f116fed72eb70da1d503cf3c225dce68d658dabd'
+sha1sums=('786e7edb849e1bd2be917f574da92ebefd0e1915'
+ '9f2dbf7a3faab24ca92266400aa513fecd3895c8'
'b04994c005910b4bf123f034b30109d5c8d6fd86'
- '963517b6f178d3cec3ff65f64cf6128cbde2f515'
- '644fe2bd6edaff03bc2e7a27bf1c0845a4568d6f'
- '2c22c7e900e4da9a555d26d455ed3fbf974d553d'
- '94b91fb6c7ddae9141af7568d476d69670f2706e'
- '29ea1e5d400d21a199724db8f1da30c66b310595'
+ 'e0c1a97770cc23226cf4535c029ef50b17f67974'
+ '8bcaed545956bb33581e1b97ac96a2c3717ec793'
+ '2b0c48b0121c47f0fc97871a08460420b4753b08'
+ '0d28fb02aec6a5fc5763482733ca07385a69aaaa'
+ 'e1477db3700b27b5e5ad3d8fa43028555204759b'
+ '8948d89537c12a4202df7c001e65a77030bbe5a3'
'82a27eca5277218cf57c6c5767e0b17a72f62229'
- '22bd1a4c18d8b93130ca46348c2a9ea2f8b90c6b')
+ 'beb31419045db70fee7401aa6448c220a491e2a3')
build() {
# set architecture dependent variables
@@ -65,6 +69,8 @@
## 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/
@@ -135,14 +141,11 @@
package_grub2-common() {
pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms"
install="grub2.install"
- depends=('xz' 'freetype2' 'device-mapper')
+ depends=('xz' 'freetype2' 'device-mapper' 'gettext')
conflicts=('grub')
backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
cd ${srcdir}/grub2_bios-${pkgver}
- make DESTDIR=${pkgdir} install
-
- ## install grub2-extras ntldr-img's grubinst as /sbin/grubinst
- install -Dm755 ${srcdir}/grub2_bios-${pkgver}/grub-core/grubinst ${pkgdir}/sbin/grubinst
+ make DESTDIR=${pkgdir} install
install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_bios-install
install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_efi_x86_64-install
@@ -161,7 +164,6 @@
${pkgdir}/sbin/grub_efi_i386-install
## install extra /etc/grub.d/ files
- install -Dm755 ${srcdir}/05_archtheme ${pkgdir}/etc/grub.d/05_archtheme
install -Dm755 ${srcdir}/20_memtest86+ ${pkgdir}/etc/grub.d/20_memtest86+
## install /etc/default/grub (used by grub-mkconfig)
@@ -191,8 +193,8 @@
package_grub2-efi-i386() {
pkgdesc="The GNU GRand Unified Bootloader version 2 - i386 UEFI version"
- depends=("grub2-common=${pkgver}" 'dosfstools')
- optdepends=('efibootmgr')
+ depends=("grub2-common=${pkgver}" 'dosfstools' 'efibootmgr')
+ optdepends=('mtools')
cd ${srcdir}/grub2_efi-${pkgver}
make DESTDIR=${pkgdir} install
@@ -201,13 +203,3 @@
rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share}
rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib}
}
-sha1sums=('866b6979974ad7209d236cb4e1819039f0bd1c6d'
- 'f116fed72eb70da1d503cf3c225dce68d658dabd'
- 'b04994c005910b4bf123f034b30109d5c8d6fd86'
- '963517b6f178d3cec3ff65f64cf6128cbde2f515'
- '644fe2bd6edaff03bc2e7a27bf1c0845a4568d6f'
- '2c22c7e900e4da9a555d26d455ed3fbf974d553d'
- '94b91fb6c7ddae9141af7568d476d69670f2706e'
- '29ea1e5d400d21a199724db8f1da30c66b310595'
- '82a27eca5277218cf57c6c5767e0b17a72f62229'
- '22bd1a4c18d8b93130ca46348c2a9ea2f8b90c6b')
Modified: archlinux_grub2_mkconfig_fixes.patch
===================================================================
--- archlinux_grub2_mkconfig_fixes.patch 2011-04-22 11:15:56 UTC (rev 120334)
+++ archlinux_grub2_mkconfig_fixes.patch 2011-04-22 11:24:14 UTC (rev 120335)
@@ -1,5 +1,5 @@
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index b041a38..6f31dce 100644
+index afc66f8..c80f7bf 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -252,6 +252,8 @@ export GRUB_DEFAULT \
@@ -12,7 +12,7 @@
GRUB_SAVEDEFAULT \
GRUB_BADRAM
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 420b3f3..79fd4fb 100644
+index 9da1511..6251bca 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -100,6 +100,14 @@ cat <<EOF
@@ -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 a09c3e6..cf12ea9 100644
+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"
@@ -39,9 +39,9 @@
OS=GNU/Linux
else
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+ OS="${GRUB_DISTRIBUTOR}"
-+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | tr -d ' ') ${CLASS}"
++ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | tr -d ' ') ${CLASS}"
fi
# loop-AES arranges things so that /dev/loop/X can be our root device, but
@@ -53,17 +53,22 @@
+ LINUX_ROOT_DEVICE="/dev/disk/by-uuid/${GRUB_DEVICE_UUID}"
fi
- linux_entry ()
-@@ -111,7 +111,7 @@ EOF
- EOF
- }
+ if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ]; then
+@@ -121,11 +121,11 @@ EOF
--list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do
-+list=`for i in /boot/vmlinuz* /boot/vmlinux* /vmlinuz* /vmlinux* ; do
- if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
- done`
- prepare_boot_cache=
-@@ -123,14 +123,12 @@ while [ "x$list" != "x" ] ; do
+ case x`uname -m` in
+ xi?86 | xx86_64)
+- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
++ list=`for i in /boot/vmlinuz* /vmlinuz* /boot/kernel-* ; do
+ if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+ done` ;;
+ *)
+- list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
++ list=`for i in /boot/vmlinuz* /boot/vmlinux* /vmlinuz* /vmlinux* /boot/kernel-* ; do
+ 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"`
@@ -73,15 +78,19 @@
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
initrd=
-- for i in "initrd.img-${version}" "initrd-${version}.img" \
-- "initrd-${version}" "initramfs-${version}.img" \
-- "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-- "initrd-${alt_version}" "initramfs-${alt_version}.img"; do
-+ for i in "${base_init}.img"; do
++
+ for i in "initrd.img-${version}" "initrd-${version}.img" \
+ "initrd-${version}" "initramfs-${version}.img" \
+ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+ "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+ "initramfs-genkernel-${version}" \
+- "initramfs-genkernel-${alt_version}"; do
++ "initramfs-genkernel-${alt_version}" \
++ "${basename/vmlinuz/kernel}.img"; do
if test -e "${dirname}/${i}" ; then
initrd="$i"
break
-@@ -155,6 +153,9 @@ while [ "x$list" != "x" ] ; do
+@@ -178,6 +181,9 @@ while [ "x$list" != "x" ] ; do
linux_entry "${OS}" "${version}" false \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
Added: fix_stack_pointer_handling_16_relocator.patch
===================================================================
--- fix_stack_pointer_handling_16_relocator.patch (rev 0)
+++ fix_stack_pointer_handling_16_relocator.patch 2011-04-22 11:24:14 UTC (rev 120335)
@@ -0,0 +1,29 @@
+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
++++ b/grub-core/lib/i386/relocator16.S
+@@ -130,7 +130,7 @@ VARIABLE(grub_relocator16_ss)
+ .byte 0xb8
+ VARIABLE(grub_relocator16_sp)
+ .word 0
+- movw %ax, %ss
++ movzwl %ax, %esp
+
+ /* movw imm32, %edx. */
+ .byte 0x66, 0xba
Property changes on: grub2/trunk/fix_stack_pointer_handling_16_relocator.patch
___________________________________________________________________
Added: svn:executable
+ *
Modified: grub.cfg
===================================================================
--- grub.cfg 2011-04-22 11:15:56 UTC (rev 120334)
+++ grub.cfg 2011-04-22 11:24:14 UTC (rev 120335)
@@ -1,32 +1,135 @@
-# Config file for GRUB2 - The GNU GRand Unified Bootloader
-# /boot/grub/grub.cfg
-
-# DEVICE NAME CONVERSIONS
#
-# Linux Grub
-# -------------------------
-# /dev/fd0 (fd0)
-# /dev/sda (hd0)
-# /dev/sdb2 (hd1,2)
-# /dev/sda3 (hd0,3)
+# DO NOT EDIT THIS FILE
#
+# It is automatically generated by grub-mkconfig using templates
+# from /etc/grub.d and settings from /etc/default/grub
+#
-# Timeout for menu
+### BEGIN /etc/grub.d/00_header ###
+insmod part_gpt
+insmod part_msdos
+if [ -s $prefix/grubenv ]; then
+ load_env
+fi
+set default="0"
+if [ "${prev_saved_entry}" ]; then
+ set saved_entry="${prev_saved_entry}"
+ save_env saved_entry
+ set prev_saved_entry=
+ save_env prev_saved_entry
+ set boot_once=true
+fi
+
+function savedefault {
+ if [ -z "${boot_once}" ]; then
+ saved_entry="${chosen}"
+ save_env saved_entry
+ fi
+}
+
+function load_video {
+ insmod vbe
+ insmod vga
+ insmod video_bochs
+ insmod video_cirrus
+}
+
+insmod part_msdos
+insmod ext2
+set root='(hd0,msdos3)'
+search --no-floppy --fs-uuid --set=root fb70f55b-e58a-4ac6-af45-19d19cc24d60
+if loadfont /usr/share/grub/unicode.pf2 ; then
+ set gfxmode=auto
+ load_video
+ insmod gfxterm
+ insmod part_msdos
+ insmod ext2
+ set root='(hd0,msdos3)'
+ search --no-floppy --fs-uuid --set=root fb70f55b-e58a-4ac6-af45-19d19cc24d60
+ set locale_dir=($root)/boot/grub/locale
+ set lang=en_US
+ insmod gettext
+fi
+terminal_input console
+terminal_output gfxterm
set timeout=5
+### END /etc/grub.d/00_header ###
-# Set default boot entry as Entry 0
-set default=0
+### BEGIN /etc/grub.d/10_linux ###
+menuentry 'Arch Linux, with Linux vmlinuz26-lts' --class archlinux --class gnu-linux --class gnu --class os {
+ load_video
+ set gfxpayload=keep
+ insmod part_msdos
+ insmod ext2
+ set root='(hd0,msdos3)'
+ search --no-floppy --fs-uuid --set=root fb70f55b-e58a-4ac6-af45-19d19cc24d60
+ echo 'Loading Linux vmlinuz26-lts ...'
+ linux /boot/vmlinuz26-lts root=/dev/disk/by-uuid/fb70f55b-e58a-4ac6-af45-19d19cc24d60 ro quiet
+ echo 'Loading initial ramdisk ...'
+ initrd /boot/kernel26-lts.img
+}
+menuentry 'Arch Linux, with Linux vmlinuz26-lts Fallback' --class archlinux --class gnu-linux --class gnu --class os {
+ load_video
+ set gfxpayload=keep
+ insmod part_msdos
+ insmod ext2
+ set root='(hd0,msdos3)'
+ search --no-floppy --fs-uuid --set=root fb70f55b-e58a-4ac6-af45-19d19cc24d60
+ echo 'Loading Linux vmlinuz26-lts ...Loading Linux Fallback ...'
+ linux /boot/vmlinuz26-lts root=/dev/disk/by-uuid/fb70f55b-e58a-4ac6-af45-19d19cc24d60 ro quiet
+ echo 'Loading initial ramdisk ...'
+ initrd /boot/kernel26-lts-fallback.img
+}
+menuentry 'Arch Linux, with Linux vmlinuz26' --class archlinux --class gnu-linux --class gnu --class os {
+ load_video
+ set gfxpayload=keep
+ insmod part_msdos
+ insmod ext2
+ set root='(hd0,msdos3)'
+ search --no-floppy --fs-uuid --set=root fb70f55b-e58a-4ac6-af45-19d19cc24d60
+ echo 'Loading Linux vmlinuz26 ...'
+ linux /boot/vmlinuz26 root=/dev/disk/by-uuid/fb70f55b-e58a-4ac6-af45-19d19cc24d60 ro quiet
+ echo 'Loading initial ramdisk ...'
+ initrd /boot/kernel26.img
+}
+menuentry 'Arch Linux, with Linux vmlinuz26 Fallback' --class archlinux --class gnu-linux --class gnu --class os {
+ load_video
+ set gfxpayload=keep
+ insmod part_msdos
+ insmod ext2
+ set root='(hd0,msdos3)'
+ search --no-floppy --fs-uuid --set=root fb70f55b-e58a-4ac6-af45-19d19cc24d60
+ echo 'Loading Linux vmlinuz26 ...Loading Linux Fallback ...'
+ linux /boot/vmlinuz26 root=/dev/disk/by-uuid/fb70f55b-e58a-4ac6-af45-19d19cc24d60 ro quiet
+ echo 'Loading initial ramdisk ...'
+ initrd /boot/kernel26-fallback.img
+}
+### END /etc/grub.d/10_linux ###
-# (0) Arch Linux
-menuentry "Arch Linux" {
-set root=(hd0,1)
-linux /vmlinuz26 root=/dev/sda1 ro
-initrd /kernel26.img
+### BEGIN /etc/grub.d/20_linux_xen ###
+### END /etc/grub.d/20_linux_xen ###
+
+### BEGIN /etc/grub.d/20_memtest86+ ###
+menuentry "Memory test (memtest86+)" --class memtest86 --class gnu --class tool {
+ insmod part_msdos
+ insmod ext2
+ set root='(hd0,msdos3)'
+ search --no-floppy --fs-uuid --set=root fb70f55b-e58a-4ac6-af45-19d19cc24d60
+ linux16 ($root)/boot/memtest86+/memtest.bin
}
+### END /etc/grub.d/20_memtest86+ ###
-## (1) Windows
-#menuentry "Windows" {
-#set root=(hd0,3)
-#chainloader +1
-#}
+### BEGIN /etc/grub.d/30_os-prober ###
+### END /etc/grub.d/30_os-prober ###
+### BEGIN /etc/grub.d/40_custom ###
+# This file provides an easy way to add custom menu entries. Simply type the
+# menu entries you want to add after this comment. Be careful not to change
+# the 'exec tail' line above.
+### END /etc/grub.d/40_custom ###
+
+### BEGIN /etc/grub.d/41_custom ###
+if [ -f $prefix/custom.cfg ]; then
+ source $prefix/custom.cfg;
+fi
+### END /etc/grub.d/41_custom ###
Modified: grub.default
===================================================================
--- grub.default 2011-04-22 11:15:56 UTC (rev 120334)
+++ grub.default 2011-04-22 11:24:14 UTC (rev 120335)
@@ -1,33 +1,36 @@
-# If you change this file, run 'update-grub' afterwards to update
-# /boot/grub/grub.cfg.
-
GRUB_DEFAULT=0
GRUB_TIMEOUT=5
GRUB_DISTRIBUTOR="Arch Linux"
GRUB_CMDLINE_LINUX_DEFAULT="quiet"
GRUB_CMDLINE_LINUX=""
+# Preload both GPT and MBR modules so that they are not missed
+GRUB_PRELOAD_MODULES="part_gpt part_msdos"
+
# Uncomment to enable Hidden Menu, and optionally hide the timeout count
#GRUB_HIDDEN_TIMEOUT=5
#GRUB_HIDDEN_TIMEOUT_QUIET=true
+# Uncomment to use basic console
+GRUB_TERMINAL_INPUT=console
+
# Uncomment to disable graphical terminal
-#GRUB_TERMINAL=console
+#GRUB_TERMINAL_OUTPUT=console
# The resolution used on graphical terminal
# note that you can use only modes which your graphic card supports via VBE
# you can see them in real GRUB with the command `vbeinfo'
-#GRUB_GFXMODE=1024x768x24
+GRUB_GFXMODE=auto
# Uncomment to allow the kernel use the same resolution used by grub
-#GRUB_GFXPAYLOAD_LINUX=keep
+GRUB_GFXPAYLOAD_LINUX=keep
# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
#GRUB_DISABLE_LINUX_UUID=true
# Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_RECOVERY="true"
+GRUB_DISABLE_RECOVERY=true
# Uncomment and set to the desired menu colors. Used by normal and wallpaper
# modes only. Entries specified as foreground/background.
Added: grub2_bzr_export.sh
===================================================================
--- grub2_bzr_export.sh (rev 0)
+++ grub2_bzr_export.sh 2011-04-22 11:24:14 UTC (rev 120335)
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+## 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:~skodabenz/grub/grub2-extras-lua lua
+# bzr branch lp:~skodabenz/grub/grub2-extras-gpxe gpxe
+# bzr branch lp:~skodabenz/grub/grub2-extras-ntldr-img ntldr-img
+# bzr branch lp:~skodabenz/grub/grub2-extras-915resolution 915resolution
+
+## grub-extras zfs is integrated into grub2 bzr main repo and is no longer needed separately.
+
+wd=${PWD}/
+output_dir=${wd}/
+
+grub2_bzr_dir=${wd}/grub2_BZR/
+grub2_bzr_exp_dir=${wd}/grub2_experimental_BZR/
+grub2_extras_dir=${wd}/grub2_extras_BZR/
+
+main_snapshot() {
+
+ cd ${grub2_bzr_dir}/
+ echo
+
+ revnum=$(bzr revno ${grub2_bzr_dir})
+ bzr export --root=grub2 --format=tar ${output_dir}/grub2_r${revnum}.tar
+ echo
+
+ cd ${output_dir}/
+
+ xz -9 ${output_dir}/grub2_r${revnum}.tar
+ echo
+
+}
+
+exp_snapshot() {
+
+ cd ${grub2_bzr_exp_dir}/
+ echo
+
+ revnum=$(bzr revno ${grub2_bzr_exp_dir})
+ bzr export --root=grub2_exp --format=tar ${output_dir}/grub2_exp_r${revnum}.tar
+ echo
+
+ cd ${output_dir}/
+
+ xz -9 ${output_dir}/grub2_exp_r${revnum}.tar
+ echo
+
+}
+
+extras_snapshot() {
+
+ cd ${grub2_extras_dir}/${grub2_extras_name}/
+ echo
+
+ revnum=$(bzr revno ${grub2_extras_dir}/${grub2_extras_name})
+ bzr export --root=${grub2_extras_name} --format=tar ${output_dir}/grub2_extras_${grub2_extras_name}_r${revnum}.tar
+ echo
+
+ cd ${output_dir}/
+ echo
+
+ xz -9 ${output_dir}/grub2_extras_${grub2_extras_name}_r${revnum}.tar
+ echo
+
+}
+
+echo
+
+set -x -e
+
+# main_snapshot
+
+# exp_snapshot
+
+grub2_extras_name="lua"
+extras_snapshot
+
+grub2_extras_name="gpxe"
+extras_snapshot
+
+grub2_extras_name="ntldr-img"
+extras_snapshot
+
+grub2_extras_name="915resolution"
+extras_snapshot
+
+set +x +e
+
+echo
+
+unset wd
+unset output_dir
+unset grub2_bzr_dir
+unset grub2_extras_dir
+unset grub2_extras_name
Property changes on: grub2/trunk/grub2_bzr_export.sh
___________________________________________________________________
Added: svn:executable
+ *
More information about the arch-commits
mailing list