[weasel-commit] Source: grub=1.98-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Sat, 19 Jun 2010 18:50:04 -0400
================================
grub:source=1.98-1 (previous: 1.97.1-5)
cvc rdiff grub -1 /weasel.rpath.org@wgl:3-devel/1.98-1
================================
1.98-1 Filip Brcic (brcha@xxxxxxxxxxxx) Sat Jun 19 18:49:13 2010
version bump
20_memtest86+: new
--- /dev/null
+++ 20_memtest86+
@@ -0,0 +27 @@
+#! /bin/sh -e
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system. #
+########################################################
+
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+
+. ${libdir}/grub/grub-mkconfig_lib
+
+MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then
+ # image exists, create menu entry
+ echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2
+ cat << EOF
+menuentry "Memory test (memtest86+)" $CLASS {
+EOF
+ prepare_grub_to_access_device `${grub_probe} --target=device
$MEMTEST86_IMAGE` | sed -e "s/^/ /"
+ cat << EOF
+ linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE`
+}
+EOF
+fi
grub.default: new
--- /dev/null
+++ grub.default
@@ -0,0 +42 @@
+# If you change this file, run 'update-grub' afterwards to update
+# /boot/grub/grub.cfg.
+
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="Weasel GNU/Linux"
+GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to enable Hidden Menu, and optionally hide the timeout count
+#GRUB_HIDDEN_TIMEOUT=5
+#GRUB_HIDDEN_TIMEOUT_QUIET=true
+
+# Uncomment to disable graphical terminal
+#GRUB_TERMINAL=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
+
+# Uncomment to allow the kernel use the same resolution used by grub
+#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_LINUX_RECOVERY="true"
+
+# Uncomment and set to the desired menu colors. Used by normal and wallpaper
+# modes only. Entries specified as foreground/background.
+GRUB_COLOR_NORMAL="light-blue/black"
+GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
+
+# Uncomment one of them for the gfx desired, a image background or a gfxtheme
+#GRUB_BACKGROUND="/path/to/wallpaper"
+#GRUB_THEME="/path/to/gfxtheme"
+
+# Uncomment to get a beep at GRUB start
+#GRUB_INIT_TUNE="480 440 1"
grub-1.98.tar.gz: new
grub.recipe: changed
Index: grub.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- grub.recipe /weasel.rpath.org@wgl:3-devel/1.97.1-5
+++ grub.recipe /weasel.rpath.org@wgl:3-devel/1.98-1
@@ -5,12 +5,17 @@
class Grub(AutoPackageRecipe):
name = 'grub'
- version = '1.97.1'
+ version = '1.98'
buildRequires = [
- 'install-info:runtime', 'ncurses:devel', 'freetype:devel',
- 'help2man:runtime', 'ruby:runtime', 'texinfo:runtime',
- 'zlib:devel',
+ 'install-info:runtime', 'perl-XML-Parser:perl',
+ 'ncurses:devel', 'freetype:devel', 'help2man:runtime',
+ 'ruby:runtime', 'texinfo:runtime', 'zlib:devel',
+ 'unifont:data', 'autoconf-wrapper:runtime',
+ 'autoconf25:runtime', 'automake-wrapper:runtime',
+ 'automake110:runtime', 'gettext:runtime', 'gettext:devel',
+ 'libtool:runtime', 'libtool:devel', 'm4:runtime',
+ 'bison:runtime',
]
shortDesc = 'GNU GRand Unified Bootloader'
@@ -22,27 +27,40 @@
def unpack(r):
r.addArchive('ftp://alpha.gnu.org/gnu/grub/')
+ # Add some patches
+ r.addPatch('archlinux-script-fixes.patch')
+ r.addPatch('gfxmenu-dependencies.patch')
+ r.addPatch('menucolors-in-mkconfig.patch')
+ r.addPatch('background-image-in-mkconfig.patch')
+ r.addPatch('hidden-timeout-fix.patch')
+
# Ignore vmlinux images since they are not to be booted from
r.Replace('vmlinu\[xz\]', 'vmlinuz', 'util/grub.d/10_linux.in')
+ r.Autoreconf()
+
+ # Set correct unifont.bdf location
+ r.Replace('/usr/src/unifont.bdf', '%(builddir)s/unifont.bdf',
+ 'configure')
+ # And unpack system unifont
+ r.Run('cp %(datadir)s/fonts/unifont/unifont.bdf.gz %(builddir)s/')
+ r.Run('gunzip unifont.bdf.gz')
+
def configure(r):
r.disableParallelMake()
+ r.macros.cflags = ''
r.Configure(
' --disable-werror'
+ ' --prefix=%(prefix)s'
+ ' --bindir=%(essentialbindir)s'
' --sbindir=%(essentialsbindir)s'
- ' --bindir=%(essentialbindir)s'
- ' --libdir=%(essentiallibdir)s'
- ' --disable-efiemu'
+ ' --mandir=%(mandir)s'
+ ' --infodir=%(infodir)s'
+ ' --sysconfdir=%(sysconfdir)s'
' --enable-grub-mkfont'
- ' --disable-mm-debug'
- ' --disable-grub-emu'
- ' --disable-grub-emu-usb'
- ' --disable-grub-fstest'
)
def policy(r):
- r.Create('%(essentiallibdir)s/grub/grub-mkconfig_lib-addition',
contents="""
-GRUB_DISTRIBUTOR="Weasel"
-""")
- r.Run('cat
%(destdir)s/%(essentiallibdir)s/grub/grub-mkconfig_lib-addition >>
%(destdir)s/%(essentiallibdir)s/grub/grub-mkconfig_lib')
- r.Remove('%(essentiallibdir)s/grub/grub-mkconfig_lib-addition')
+ r.addSource('grub.default', dest='%(sysconfdir)s/default/grub')
+
+ r.addSource('20_memtest86+', dest='%(sysconfdir)s/grub.d/')
gfxmenu-dependencies.patch: new
--- /dev/null
+++ gfxmenu-dependencies.patch
@@ -0,0 +32 @@
+diff -ur grub-1.98.orig/util/grub.d/00_header.in
grub-1.98/util/grub.d/00_header.in
+--- grub-1.98.orig/util/grub.d/00_header.in 2010-03-12 12:54:12.686589681
-0400
++++ grub-1.98/util/grub.d/00_header.in 2010-03-13 01:55:04.425437673 -0400
+@@ -108,6 +108,28 @@
+ && is_path_readable_by_grub $GRUB_THEME; then
+ echo "Found theme: $GRUB_THEME" >&2
+ prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME`
| sed -e "s/^/ /"
++ theme_dir=`dirname $GRUB_THEME`
++ old_reader="null"
++ # add any font dependency
++ for f in ${theme_dir}/*.pf2 ; do
++ if [ -e $f ] ; then
++ echo " loadfont (\$root)`make_system_path_relative_to_its_root
$f`"
++ fi
++ done
++ # adding insmod dependencies for images
++ for f in ${theme_dir}/*.{jpg,jpeg,png,tga} ; do
++ if [ -e $f ] ; then
++ case $f in
++ *.png) reader=png ;;
++ *.tga) reader=tga ;;
++ *.jpg|*.jpeg) reader=jpeg ;;
++ esac
++ if [ $old_reader != $reader ] ; then
++ echo " insmod ${reader}"
++ old_reader=$reader
++ fi
++ fi
++ done
+ cat << EOF
+ insmod gfxmenu
+ set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
hidden-timeout-fix.patch: new
--- /dev/null
+++ hidden-timeout-fix.patch
@@ -0,0 +12 @@
+diff -ur grub-1.98.orig/util/grub.d/00_header.in
grub-1.98/util/grub.d/00_header.in
+--- grub-1.98.orig/util/grub.d/00_header.in 2010-03-11 00:36:05.766730374
-0400
++++ grub-1.98/util/grub.d/00_header.in 2010-03-11 00:40:49.046203888 -0400
+@@ -150,7 +150,7 @@
+ fi
+ cat << EOF
+ if sleep$verbose --interruptible ${GRUB_HIDDEN_TIMEOUT} ; then
+- set timeout=${GRUB_TIMEOUT}
++ set timeout=0
+ fi
+ EOF
+ else
archlinux-script-fixes.patch: new
--- /dev/null
+++ archlinux-script-fixes.patch
@@ -0,0 +59 @@
+diff -ur grub-1.98.orig/util/grub.d/10_linux.in
grub-1.98/util/grub.d/10_linux.in
+--- grub-1.98.orig/util/grub.d/10_linux.in 2010-03-13 22:10:15.953099258
-0400
++++ grub-1.98/util/grub.d/10_linux.in 2010-03-13 22:10:44.217896122 -0400
+@@ -30,8 +30,8 @@
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+ OS=GNU/Linux
+ else
+- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
++ OS="${GRUB_DISTRIBUTOR}"
++ 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
+@@ -46,7 +46,7 @@
+ || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ; then
+ LINUX_ROOT_DEVICE=${GRUB_DEVICE}
+ else
+- LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
++ LINUX_ROOT_DEVICE="/dev/disk/by-uuid/${GRUB_DEVICE_UUID}"
+ fi
+
+ linux_entry ()
+@@ -97,7 +97,7 @@
+ EOF
+ }
+
+-list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
++list=`for i in /boot/vmlinu[xz]* /vmlinu[xz]* ; do
+ if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+ done`
+ prepare_boot_cache=
+@@ -109,13 +109,12 @@
+ 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}" "initrd.img-${alt_version}" \
+- "initrd-${alt_version}.img" "initrd-${alt_version}"; do
++ for i in "${base_init}.img"; do
+ if test -e "${dirname}/${i}" ; then
+ initrd="$i"
+ break
+@@ -130,6 +129,9 @@
+
+ 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 [ "x${GRUB_DISABLE_LINUX_RECOVERY}" != "xtrue" ]; then
+ linux_entry "${OS}" "${version}" true \
+ "single ${GRUB_CMDLINE_LINUX}"
background-image-in-mkconfig.patch: new
--- /dev/null
+++ background-image-in-mkconfig.patch
@@ -0,0 +35 @@
+diff -urN grub-1.98.orig/util/grub.d/00_header.in
grub-1.98/util/grub.d/00_header.in
+--- grub-1.98.orig/util/grub.d/00_header.in 2010-03-10 20:30:56.319608325
-0400
++++ grub-1.98/util/grub.d/00_header.in 2010-03-10 23:01:20.856612701 -0400
+@@ -104,6 +104,20 @@
+ terminal gfxterm
+ fi
+ EOF
++if [ x$GRUB_BACKGROUND != x ] && [ -f $GRUB_BACKGROUND ] \
++ && is_path_readable_by_grub $GRUB_BACKGROUND; then
++ echo "Found background: $GRUB_BACKGROUND" >&2
++ case $GRUB_BACKGROUND in
++ *.png) reader=png ;;
++ *.tga) reader=tga ;;
++ *.jpg|*.jpeg) reader=jpeg ;;
++ esac
++ prepare_grub_to_access_device `${grub_probe} --target=device
$GRUB_BACKGROUND` | sed -e "s/^/ /"
++ cat << EOF
++ insmod $reader
++ background_image (\$root)`make_system_path_relative_to_its_root
$GRUB_BACKGROUND`
++EOF
++fi
+ if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
+ && is_path_readable_by_grub $GRUB_THEME; then
+ echo "Found theme: $GRUB_THEME" >&2
+diff -urN grub-1.98.orig/util/grub-mkconfig.in grub-1.98/util/grub-mkconfig.in
+--- grub-1.98.orig/util/grub-mkconfig.in 2010-03-10 20:30:56.319608325
-0400
++++ grub-1.98/util/grub-mkconfig.in 2010-03-10 20:34:00.689582261 -0400
+@@ -220,6 +220,7 @@
+ GRUB_DISABLE_LINUX_UUID \
+ GRUB_DISABLE_LINUX_RECOVERY \
+ GRUB_GFXMODE \
++ GRUB_BACKGROUND \
+ GRUB_THEME \
+ GRUB_GFXPAYLOAD_LINUX \
+ GRUB_DISABLE_OS_PROBER \
menucolors-in-mkconfig.patch: new
--- /dev/null
+++ menucolors-in-mkconfig.patch
@@ -0,0 +29 @@
+diff -ur grub-1.98.orig/util/grub.d/00_header.in
grub-1.98/util/grub.d/00_header.in
+--- grub-1.98.orig/util/grub.d/00_header.in 2010-03-11 00:36:05.766730374
-0400
++++ grub-1.98/util/grub.d/00_header.in 2010-03-11 00:36:27.252903963 -0400
+@@ -59,6 +59,13 @@
+ }
+ EOF
+
++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
++ cat << EOF
++set menu_color_normal=$GRUB_COLOR_NORMAL
++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
++
++EOF
++fi
+ case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in
+ serial:* | *:serial)
+ if ! test -e ${grub_prefix}/serial.mod ; then
+diff -ur grub-1.98.orig/util/grub-mkconfig.in grub-1.98/util/grub-mkconfig.in
+--- grub-1.98.orig/util/grub-mkconfig.in 2010-03-11 00:36:05.781282507
-0400
++++ grub-1.98/util/grub-mkconfig.in 2010-03-11 00:36:21.511483268 -0400
+@@ -223,6 +223,8 @@
+ GRUB_THEME \
+ GRUB_GFXPAYLOAD_LINUX \
+ GRUB_DISABLE_OS_PROBER \
++ GRUB_COLOR_NORMAL \
++ GRUB_COLOR_HIGHLIGHT \
+ GRUB_INIT_TUNE \
+ GRUB_SAVEDEFAULT
+
grub-1.97.1.tar.gz: removed
Committed by: brcha
Other related posts:
