[arch-commits] Commit in grub2/trunk (8 files)
Ronald van Haren
ronald at archlinux.org
Fri Jan 28 18:09:41 UTC 2011
Date: Friday, January 28, 2011 @ 13:09:41
Author: ronald
Revision: 107988
remove old patches, don't work anymore with grub 1.99
Deleted:
grub2/trunk/archlinux-script-fixes.patch
grub2/trunk/background-image-in-mkconfig.patch
grub2/trunk/gfxmenu-dependencies.patch
grub2/trunk/grub-1.96-chainloader.patch
grub2/trunk/grubconfig.archlinux.patch
grub2/trunk/hidden-timeout-fix.patch
grub2/trunk/lvm-detection.patch
grub2/trunk/menucolors-in-mkconfig.patch
------------------------------------+
archlinux-script-fixes.patch | 59 -----------------------------------
background-image-in-mkconfig.patch | 35 --------------------
gfxmenu-dependencies.patch | 32 ------------------
grub-1.96-chainloader.patch | 23 -------------
grubconfig.archlinux.patch | 51 ------------------------------
hidden-timeout-fix.patch | 12 -------
lvm-detection.patch | 25 --------------
menucolors-in-mkconfig.patch | 29 -----------------
8 files changed, 266 deletions(-)
Deleted: archlinux-script-fixes.patch
===================================================================
--- archlinux-script-fixes.patch 2011-01-28 12:16:56 UTC (rev 107987)
+++ archlinux-script-fixes.patch 2011-01-28 18:09:41 UTC (rev 107988)
@@ -1,59 +0,0 @@
-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}"
Deleted: background-image-in-mkconfig.patch
===================================================================
--- background-image-in-mkconfig.patch 2011-01-28 12:16:56 UTC (rev 107987)
+++ background-image-in-mkconfig.patch 2011-01-28 18:09:41 UTC (rev 107988)
@@ -1,35 +0,0 @@
-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 \
Deleted: gfxmenu-dependencies.patch
===================================================================
--- gfxmenu-dependencies.patch 2011-01-28 12:16:56 UTC (rev 107987)
+++ gfxmenu-dependencies.patch 2011-01-28 18:09:41 UTC (rev 107988)
@@ -1,32 +0,0 @@
-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`
Deleted: grub-1.96-chainloader.patch
===================================================================
--- grub-1.96-chainloader.patch 2011-01-28 12:16:56 UTC (rev 107987)
+++ grub-1.96-chainloader.patch 2011-01-28 18:09:41 UTC (rev 107988)
@@ -1,23 +0,0 @@
-diff -Nru grub-1.96.orig/kern/i386/pc/startup.S grub-1.96/kern/i386/pc/startup.S
---- grub-1.96.orig/kern/i386/pc/startup.S 2008-02-03 14:11:32.000000000 +0100
-+++ grub-1.96_20081229/kern/i386/pc/startup.S 2008-02-17 06:22:54.000000000 +0100
-@@ -594,15 +594,15 @@
-
- call EXT_C(grub_dl_unload_all)
-
-+ /* Turn off Gate A20 */
-+ xorl %eax, %eax
-+ call EXT_C(grub_gate_a20)
-+
- /* set up to pass boot drive */
- popl %edx
-
- /* ESI must point to a partition table entry */
- popl %esi
--
-- /* Turn off Gate A20 */
-- xorl %eax, %eax
-- call EXT_C(grub_gate_a20)
-
- call prot_to_real
- .code16
Deleted: grubconfig.archlinux.patch
===================================================================
--- grubconfig.archlinux.patch 2011-01-28 12:16:56 UTC (rev 107987)
+++ grubconfig.archlinux.patch 2011-01-28 18:09:41 UTC (rev 107988)
@@ -1,51 +0,0 @@
-diff -Naur /etc/grub.d.orig/10_linux /etc/grub.d/10_linux
---- /etc/grub.d.orig/10_linux.in 2010-03-16 12:05:22.998499105 +0100
-+++ /etc/grub.d/10_linux.in 2010-03-16 13:26:36.669907054 +0100
-@@ -28,10 +28,10 @@
- CLASS="--class gnu-linux --class gnu --class os"
-
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-- OS=GNU/Linux
-+ OS="Arch Linux"
- else
-- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
-+ OS="${GRUB_DISTRIBUTOR} Arch Linux"
-+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' ) ${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,11 +97,12 @@
- 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=
-
-+
- while [ "x$list" != "x" ] ; do
- linux=`version_find_latest $list`
- echo "Found linux image: $linux" >&2
-@@ -113,9 +114,7 @@
- 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 "$(echo $basename|sed 's|vmlinuz|kernel|'|sed 's|$|.img|')"; do
- if test -e "${dirname}/${i}" ; then
- initrd="$i"
- break
Deleted: hidden-timeout-fix.patch
===================================================================
--- hidden-timeout-fix.patch 2011-01-28 12:16:56 UTC (rev 107987)
+++ hidden-timeout-fix.patch 2011-01-28 18:09:41 UTC (rev 107988)
@@ -1,12 +0,0 @@
-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
Deleted: lvm-detection.patch
===================================================================
--- lvm-detection.patch 2011-01-28 12:16:56 UTC (rev 107987)
+++ lvm-detection.patch 2011-01-28 18:09:41 UTC (rev 107988)
@@ -1,25 +0,0 @@
---- util/getroot.c~ 2010-07-12 20:34:58.498317508 +0200
-+++ util/getroot.c 2010-07-12 20:34:58.556288678 +0200
-@@ -222,9 +222,20 @@
- /* Ignore any error. */
- continue;
-
-- if (S_ISLNK (st.st_mode))
-- /* Don't follow symbolic links. */
-+ if (S_ISLNK (st.st_mode)) {
-+#ifdef __linux__
-+ if (strcmp (dir, "mapper") == 0) {
-+ /* Follow symbolic links under /dev/mapper/; the canonical name
-+ may be something like /dev/dm-0, but the names under
-+ /dev/mapper/ are more human-readable and so we prefer them if
-+ we can get them. */
-+ if (stat (ent->d_name, &st) < 0)
-+ continue;
-+ } else
-+#endif /* __linux__ */
-+ /* Don't follow other symbolic links. */
- continue;
-+ }
-
- if (S_ISDIR (st.st_mode))
- {
Deleted: menucolors-in-mkconfig.patch
===================================================================
--- menucolors-in-mkconfig.patch 2011-01-28 12:16:56 UTC (rev 107987)
+++ menucolors-in-mkconfig.patch 2011-01-28 18:09:41 UTC (rev 107988)
@@ -1,29 +0,0 @@
-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
-
More information about the arch-commits
mailing list