packages: grub2/grub-garbage.patch, grub2/grub-install.in.patch, grub2/grub...
arekm
arekm at pld-linux.org
Thu Sep 8 13:21:14 CEST 2011
Author: arekm Date: Thu Sep 8 11:21:14 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.99 rc2 (1.98 on GRUB2_1_98)
---- Files affected:
packages/grub2:
grub-garbage.patch (1.1 -> 1.2) , grub-install.in.patch (1.2 -> 1.3) , grub-mkconfig-diagnostics.patch (1.3 -> 1.4) , grub2.spec (1.99 -> 1.100) , pld-initrd.patch (1.1 -> 1.2) , pld-mkconfigdir.patch (1.1 -> 1.2) , pld-sysconfdir.patch (1.2 -> 1.3) , 20_memtest86 (1.1 -> NONE) (REMOVED), grub-1.98-follow-dev-mapper-symlinks.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/grub2/grub-garbage.patch
diff -u packages/grub2/grub-garbage.patch:1.1 packages/grub2/grub-garbage.patch:1.2
--- packages/grub2/grub-garbage.patch:1.1 Thu Nov 12 08:55:45 2009
+++ packages/grub2/grub-garbage.patch Thu Sep 8 13:21:08 2011
@@ -1,50 +1,12 @@
-http://lists.gnu.org/archive/html/grub-devel/2008-04/msg00079.html
-
-Self-explainable. Make update-grub ignore rpm leftover files and VIM
-swap files.
-
-2008-04-15 Lubomir Kundrak <lkundrak at redhat.com>
-
- * util/update-grub.in: replace the junk file switch with
- unconditional call to grub_file_is_not_garbage
- * util/update-grub_lib.in (grub_file_is_not_garbage): ignore
- also rpm leftover files and editor backup files
-
---- grub-1.97.1/util/grub-mkconfig.in~ 2009-11-11 22:14:09.000000000 +0200
-+++ grub-1.97.1/util/grub-mkconfig.in 2009-11-12 09:50:15.902686831 +0200
-@@ -247,18 +247,12 @@
- EOF
-
- for i in ${grub_mkconfig_dir}/* ; do
-- case "$i" in
-- # emacsen backup files. FIXME: support other editors
-- *~) ;;
-- *)
-- if grub_file_is_not_garbage "$i" && test -x "$i" ; then
-- echo
-- echo "### BEGIN $i ###"
-- "$i"
-- echo "### END $i ###"
-- fi
-- ;;
-- esac
-+ if grub_file_is_not_garbage "$i" && test -x "$i" ; then
-+ echo
-+ echo "### BEGIN $i ###"
-+ "$i"
-+ echo "### END $i ###"
-+ fi
- done
-
- if test "x${grub_cfg}" != "x" ; then
---- grub-1.97.1/util/grub-mkconfig_lib.in~ 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/grub-mkconfig_lib.in 2009-11-12 09:52:32.845160944 +0200
-@@ -158,6 +158,8 @@
+--- grub-1.99~rc2/util/grub-mkconfig_lib.in~ 2011-04-10 15:29:35.000000000 +0200
++++ grub-1.99~rc2/util/grub-mkconfig_lib.in 2011-09-06 22:14:55.086131157 +0200
+@@ -139,6 +139,8 @@
if test -f "$1" ; then
case "$1" in
*.dpkg-*) return 1 ;; # debian dpkg
+ *.rpmnew|*.rpmsave) return 1 ;; # Fedora rpm
+ *.bak|*~|.*.swp) return 1 ;; # backup and swap files from editors
+ README*) return 1 ;; # documentation
esac
else
- return 1
+
================================================================
Index: packages/grub2/grub-install.in.patch
diff -u packages/grub2/grub-install.in.patch:1.2 packages/grub2/grub-install.in.patch:1.3
--- packages/grub2/grub-install.in.patch:1.2 Fri May 21 23:14:03 2010
+++ packages/grub2/grub-install.in.patch Thu Sep 8 13:21:08 2011
@@ -1,91 +1,47 @@
---- grub-1.98/util/grub-install.in.orig 2010-05-21 22:35:21.921205822 +0200
-+++ grub-1.98/util/grub-install.in 2010-05-21 22:42:47.052967731 +0200
+--- grub-1.99~rc2/conf/Makefile.common~ 2011-09-08 12:39:42.000000000 +0200
++++ grub-1.99~rc2/conf/Makefile.common 2011-09-08 13:12:11.194868113 +0200
+@@ -100,7 +100,7 @@
+
+ grubconfdir = /lib/grub.d
+ grubdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
+-platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
++platformdir = $(pkglibrootdir)
+
+ CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
+ CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap
+--- grub-1.99~rc2/util/grub-install.in~ 2011-04-03 15:36:21.000000000 +0200
++++ grub-1.99~rc2/util/grub-install.in 2011-09-06 22:18:41.574849650 +0200
@@ -31,7 +31,7 @@
+ target_cpu=@target_cpu@
platform=@platform@
host_os=@host_os@
- font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
--pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
-+pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME} | sed ${transform}`
+-pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`"
++pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME} | sed ${transform}`"
+ localedir="@datadir@/locale"
- grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
- if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] || [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
-@@ -244,23 +244,6 @@
+ self="`basename $0`"
+@@ -431,23 +431,6 @@
exit 1
fi
-# Copy the GRUB images to the GRUB directory.
--for file in ${grubdir}/*.mod ${grubdir}/*.lst ${grubdir}/*.img ${grubdir}/efiemu??.o; do
-- if test -f $file && [ "`basename $file`" != menu.lst ]; then
-- rm -f $file || exit 1
+-for file in "${grubdir}"/*.mod "${grubdir}"/*.lst "${grubdir}"/*.img "${grubdir}"/efiemu??.o; do
+- if test -f "$file" && [ "`basename $file`" != menu.lst ]; then
+- rm -f "$file" || exit 1
- fi
-done
--for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst; do
-- cp -f $file ${grubdir} || exit 1
+-for file in "${pkglibdir}"/*.mod "${pkglibdir}"/*.lst; do
+- cp -f "$file" "${grubdir}" || exit 1
-done
-if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
-- for file in ${pkglibdir}/*.img ${pkglibdir}/efiemu??.o; do
-- if test -f $file; then
-- cp -f $file ${grubdir} || exit 1
+- for file in "${pkglibdir}"/*.img "${pkglibdir}"/efiemu??.o; do
+- if test -f "$file"; then
+- cp -f "$file" "${grubdir}" || exit 1
- fi
- done
-fi
-
# Copy gettext files
- mkdir -p ${grubdir}/locale/
- for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
---- grub-1.98/util/i386/efi/grub-install.in.orig 2010-03-06 21:51:37.000000000 +0100
-+++ grub-1.98/util/i386/efi/grub-install.in 2010-05-21 22:49:13.733969750 +0200
-@@ -30,7 +30,7 @@
- target_cpu=@target_cpu@
- platform=@platform@
- host_os=@host_os@
--pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
-+pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME} | sed ${transform}`
-
- grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
- grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
-@@ -170,16 +170,6 @@
- exit 1
- fi
-
--# Copy the GRUB images to the GRUB directory.
--for file in ${grubdir}/*.mod ${grubdir}/*.lst; do
-- if test -f $file && [ "`basename $file`" != menu.lst ]; then
-- rm -f $file || exit 1
-- fi
--done
--for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst; do
-- cp -f $file ${grubdir} || exit 1
--done
--
- # Copy gettext files
- mkdir -p ${grubdir}/locale/
- for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
---- grub-1.98/util/ieee1275/grub-install.in.orig 2010-03-06 21:51:37.000000000 +0100
-+++ grub-1.98/util/ieee1275/grub-install.in 2010-05-21 22:52:06.437969478 +0200
-@@ -32,7 +32,7 @@
- PACKAGE_VERSION=@PACKAGE_VERSION@
- target_cpu=@target_cpu@
- platform=@platform@
--pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
-+pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME} | sed ${transform}`
-
- grub_mkimage=${bindir}/`echo grub-mkelfimage | sed ${transform}`
- grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
-@@ -154,16 +154,6 @@
- $grub_mkdevicemap --device-map=$device_map $no_floppy || exit 1
- fi
-
--# Copy the GRUB images to the GRUB directory.
--for file in ${grubdir}/*.mod ${grubdir}/*.lst ; do
-- if test -f $file; then
-- rm -f $file || exit 1
-- fi
--done
--for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst ; do
-- cp -f $file ${grubdir} || exit 1
--done
--
- if ! test -f ${grubdir}/grubenv; then
- $grub_editenv ${grubdir}/grubenv create
- fi
+ mkdir -p "${grubdir}"/locale/
+ for dir in "${localedir}"/*; do
+
================================================================
Index: packages/grub2/grub-mkconfig-diagnostics.patch
diff -u packages/grub2/grub-mkconfig-diagnostics.patch:1.3 packages/grub2/grub-mkconfig-diagnostics.patch:1.4
--- packages/grub2/grub-mkconfig-diagnostics.patch:1.3 Tue Jul 27 21:46:35 2010
+++ packages/grub2/grub-mkconfig-diagnostics.patch Thu Sep 8 13:21:08 2011
@@ -30,58 +30,55 @@
+
+# close diagnostic stream
+exec 3>&-
---- grub-1.97.2/util/grub.d/10_linux.in~ 2010-03-10 18:09:58.838434522 +0200
-+++ grub-1.97.2/util/grub.d/10_linux.in 2010-03-10 18:12:47.478176169 +0200
-@@ -67,7 +67,7 @@
-
- while [ "x$list" != "x" ] ; do
- linux=`version_find_latest $list`
-- echo "Found linux image: $linux" >&2
-+ echo "Found linux image: $linux" >&3
- basename=`basename $linux`
- dirname=`dirname $linux`
- rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -85,7 +85,7 @@
+diff -ur grub-1.99~rc2/util/grub.d.org/00_header.in grub-1.99~rc2/util/grub.d/00_header.in
+--- grub-1.99~rc2/util/grub.d.org/00_header.in 2011-04-06 13:14:27.000000000 +0200
++++ grub-1.99~rc2/util/grub.d/00_header.in 2011-09-06 22:29:51.721223357 +0200
+@@ -113,7 +113,7 @@
+
+ if [ "x$serial" = x1 ]; then
+ if ! test -e ${GRUB_PREFIX}/serial.mod ; then
+- echo "Serial terminal not available on this platform." >&2 ; exit 1
++ echo "Serial terminal not available on this platform." >&3 ; exit 1
fi
- done
- if test -n "${initrd}" ; then
-- echo "Found initrd image: ${dirname}/${initrd}" >&2
-+ echo "Found initrd image: ${dirname}/${initrd}" >&3
- else
- # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here.
- linux_root_device_thisversion=${GRUB_DEVICE}
---- grub-1.97.2/util/grub.d/30_os-prober.in 2010-03-10 18:13:43.784870350 +0200
-+++ grub-1.98/util/grub.d/30_os-prober.in 2010-07-27 22:42:57.317305712 +0300
-@@ -47,7 +47,7 @@
- LONGNAME="${LABEL}"
- fi
-
-- echo "Found ${LONGNAME} on ${DEVICE}" >&2
-+ echo "Found ${LONGNAME} on ${DEVICE}" >&3
- case ${BOOT} in
- chain)
-@@ -197,7 +197,7 @@
+ if [ "x${GRUB_SERIAL_COMMAND}" = "x" ] ; then
+@@ -174,7 +174,7 @@
+ if [ "x$gfxterm" = x1 ]; then
+ if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
+ && is_path_readable_by_grub "$GRUB_THEME"; then
+- echo "Found theme: $GRUB_THEME" >&2
++ echo "Found theme: $GRUB_THEME" >&3
+ prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"`
+ cat << EOF
+ insmod gfxmenu
+@@ -208,12 +208,12 @@
EOF
- ;;
- *)
-- echo " ${LONGNAME} is not yet supported by grub-mkconfig." >&2
-+ echo " ${LONGNAME} is not yet supported by grub-mkconfig." >&3
- ;;
- esac
- done
---- grub-1.97.2/util/grub.d/10_hurd.in~ 2010-03-10 18:15:07.000000000 +0200
-+++ grub-1.97.2/util/grub.d/10_hurd.in 2010-03-10 18:23:36.364190317 +0200
-@@ -37,7 +37,7 @@
+ elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
+ && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
+- echo "Found background: $GRUB_BACKGROUND" >&2
++ echo "Found background: $GRUB_BACKGROUND" >&3
+ case "$GRUB_BACKGROUND" in
+ *.png) reader=png ;;
+ *.tga) reader=tga ;;
+ *.jpg|*.jpeg) reader=jpeg ;;
+- *) echo "Unsupported image format" >&2; exit 1 ;;
++ *) echo "Unsupported image format" >&3; exit 1 ;;
+ esac
+ prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"`
+ cat << EOF
+diff -ur grub-1.99~rc2/util/grub.d.org/10_hurd.in grub-1.99~rc2/util/grub.d/10_hurd.in
+--- grub-1.99~rc2/util/grub.d.org/10_hurd.in 2011-02-12 07:55:26.000000000 +0100
++++ grub-1.99~rc2/util/grub.d/10_hurd.in 2011-09-06 22:29:51.721223357 +0200
+@@ -41,7 +41,7 @@
basename=`basename $i`
dirname=`dirname $i`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
- echo "Found GNU Mach: $i" >&2
+ echo "Found GNU Mach: $i" >&3
- kernel=${rel_dirname}/${basename}
+ kernels="${kernels} ${rel_dirname}/${basename}"
at_least_one=true
fi
-@@ -51,7 +51,7 @@
+@@ -55,7 +55,7 @@
for i in /hurd/${hurd_fs}.static /hurd/exec ; do
if test -e "$i" ; then
@@ -90,31 +87,19 @@
at_least_one=true
else
all_of_them=false
---- grub-1.97.2/util/grub.d/10_windows.in~ 2010-03-10 18:15:07.000000000 +0200
-+++ grub-1.97.2/util/grub.d/10_windows.in 2010-03-10 18:24:57.464181349 +0200
@@ -68,7 +68,7 @@
- # Get boot /dev/ice.
- dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
+ fi
-- echo "Found $OS on $dir ($dev)" >&2
-+ echo "Found $OS on $dir ($dev)" >&3
- cat << EOF
- menuentry "$OS" {
- EOF
---- grub-1.98/util/grub.d/00_header.in~ 2010-07-20 01:42:22.000000000 +0300
-+++ grub-1.98/util/grub.d/00_header.in 2010-07-27 22:41:33.246481300 +0300
-@@ -106,7 +106,7 @@
- EOF
- if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
- && is_path_readable_by_grub $GRUB_THEME; then
-- echo "Found theme: $GRUB_THEME" >&2
-+ echo "Found theme: $GRUB_THEME" >&3
- prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/ /"
- cat << EOF
- insmod gfxmenu
---- grub-1.98/util/grub.d/10_kfreebsd.in~ 2010-03-06 22:51:37.000000000 +0200
-+++ grub-1.98/util/grub.d/10_kfreebsd.in 2010-07-27 22:42:27.877517513 +0300
-@@ -82,7 +82,7 @@
+ if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else
+- echo "Some Hurd stuff found, but not enough to boot." >&2
++ echo "Some Hurd stuff found, but not enough to boot." >&3
+ exit 1
+ fi
+
+diff -ur grub-1.99~rc2/util/grub.d.org/10_kfreebsd.in grub-1.99~rc2/util/grub.d/10_kfreebsd.in
+--- grub-1.99~rc2/util/grub.d.org/10_kfreebsd.in 2011-03-29 02:56:38.000000000 +0200
++++ grub-1.99~rc2/util/grub.d/10_kfreebsd.in 2011-09-06 22:29:51.721223357 +0200
+@@ -130,7 +130,7 @@
while [ "x$list" != "x" ] ; do
kfreebsd=`version_find_latest $list`
@@ -123,12 +108,99 @@
basename=`basename $kfreebsd`
dirname=`dirname $kfreebsd`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -111,7 +111,7 @@
+@@ -179,7 +179,7 @@
fi
done
- if test -n "${acpi_ko}" ; then
-- echo "Found ACPI module: ${acpi_ko}" >&2
-+ echo "Found ACPI module: ${acpi_ko}" >&3
- acpi_ko_basename=`basename ${acpi_ko}`
- acpi_ko_dirname=`dirname ${acpi_ko}`
- acpi_ko_rel_dirname=`make_system_path_relative_to_its_root $acpi_ko_dirname`
+ if test -n "${module_dir}" ; then
+- echo "Found kernel module directory: ${module_dir}" >&2
++ echo "Found kernel module directory: ${module_dir}" >&3
+ module_dir_rel=$(make_system_path_relative_to_its_root $module_dir)
+ fi
+
+diff -ur grub-1.99~rc2/util/grub.d.org/10_linux.in grub-1.99~rc2/util/grub.d/10_linux.in
+--- grub-1.99~rc2/util/grub.d.org/10_linux.in 2011-09-06 22:29:38.914236841 +0200
++++ grub-1.99~rc2/util/grub.d/10_linux.in 2011-09-06 22:29:51.721223357 +0200
+@@ -134,7 +134,7 @@
+
+ while [ "x$list" != "x" ] ; do
+ linux=`version_find_latest $list`
+- echo "Found linux image: $linux" >&2
++ echo "Found linux image: $linux" >&3
+ basename=`basename $linux`
+ dirname=`dirname $linux`
+ rel_dirname=`make_system_path_relative_to_its_root $dirname`
+@@ -169,7 +169,7 @@
+ fi
+
+ if test -n "${initrd}" ; then
+- echo "Found initrd image: ${dirname}/${initrd}" >&2
++ echo "Found initrd image: ${dirname}/${initrd}" >&3
+ elif test -z "${initramfs}" ; then
+ # "UUID=" magic is parsed by initrd or initramfs. Since there's
+ # no initrd or builtin initramfs, it can't work here.
+diff -ur grub-1.99~rc2/util/grub.d.org/10_netbsd.in grub-1.99~rc2/util/grub.d/10_netbsd.in
+--- grub-1.99~rc2/util/grub.d.org/10_netbsd.in 2011-01-10 17:25:52.000000000 +0100
++++ grub-1.99~rc2/util/grub.d/10_netbsd.in 2011-09-06 22:29:51.721223357 +0200
+@@ -133,7 +133,7 @@
+ continue
+ fi
+
+- echo "Found NetBSD kernel: $k" >&2
++ echo "Found NetBSD kernel: $k" >&3
+ netbsd_entry "knetbsd" "$k" false "${GRUB_CMDLINE_NETBSD_DEFAULT}"
+ netbsd_entry "multiboot" "$k" false "${GRUB_CMDLINE_NETBSD_DEFAULT}"
+ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
+diff -ur grub-1.99~rc2/util/grub.d.org/10_windows.in grub-1.99~rc2/util/grub.d/10_windows.in
+--- grub-1.99~rc2/util/grub.d.org/10_windows.in 2010-12-01 15:45:43.000000000 +0100
++++ grub-1.99~rc2/util/grub.d/10_windows.in 2011-09-06 22:29:51.721223357 +0200
+@@ -76,7 +76,7 @@
+ # Get boot /dev/ice.
+ dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
+
+- echo "Found $OS on $drv ($dev)" >&2
++ echo "Found $OS on $drv ($dev)" >&3
+ cat << EOF
+ menuentry "$OS" {
+ EOF
+diff -ur grub-1.99~rc2/util/grub.d.org/20_linux_xen.in grub-1.99~rc2/util/grub.d/20_linux_xen.in
+--- grub-1.99~rc2/util/grub.d.org/20_linux_xen.in 2011-04-13 21:20:29.000000000 +0200
++++ grub-1.99~rc2/util/grub.d/20_linux_xen.in 2011-09-06 22:29:51.721223357 +0200
+@@ -134,7 +134,7 @@
+ echo "submenu \"Xen ${xen_version}\" {"
+ while [ "x$list" != "x" ] ; do
+ linux=`version_find_latest $list`
+- echo "Found linux image: $linux" >&2
++ echo "Found linux image: $linux" >&3
+ basename=`basename $linux`
+ dirname=`dirname $linux`
+ rel_dirname=`make_system_path_relative_to_its_root $dirname`
+@@ -154,7 +154,7 @@
+ fi
+ done
+ if test -n "${initrd}" ; then
+- echo "Found initrd image: ${dirname}/${initrd}" >&2
++ echo "Found initrd image: ${dirname}/${initrd}" >&3
+ else
+ # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here.
+ linux_root_device_thisversion=${GRUB_DEVICE}
+diff -ur grub-1.99~rc2/util/grub.d.org/30_os-prober.in grub-1.99~rc2/util/grub.d/30_os-prober.in
+--- grub-1.99~rc2/util/grub.d.org/30_os-prober.in 2010-12-25 18:13:57.000000000 +0100
++++ grub-1.99~rc2/util/grub.d/30_os-prober.in 2011-09-06 22:29:51.721223357 +0200
+@@ -99,7 +99,7 @@
+ LONGNAME="${LABEL}"
+ fi
+
+- echo "Found ${LONGNAME} on ${DEVICE}" >&2
++ echo "Found ${LONGNAME} on ${DEVICE}" >&3
+
+ case ${BOOT} in
+ chain)
+@@ -198,7 +198,7 @@
+ EOF
+ ;;
+ *)
+- echo " ${LONGNAME} is not yet supported by grub-mkconfig." >&2
++ echo " ${LONGNAME} is not yet supported by grub-mkconfig." >&3
+ ;;
+ esac
+ done
================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.99 packages/grub2/grub2.spec:1.100
--- packages/grub2/grub2.spec:1.99 Thu Sep 1 19:04:17 2011
+++ packages/grub2/grub2.spec Thu Sep 8 13:21:08 2011
@@ -30,13 +30,14 @@
Summary(hu.UTF-8): GRUB2 - rendszerbetöltő x86 és ppc gépekhez
Summary(pl.UTF-8): GRUB2 - bootloader dla x86 i ppc
Summary(pt_BR.UTF-8): Gerenciador de inicialização GRUB2
+%define rcver rc2
Name: grub2
-Version: 1.98
-Release: 3
+Version: 1.99
+Release: 0.%{rcver}.1
License: GPL v2
Group: Base
-Source0: http://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz
-# Source0-md5: c0bcf60e524739bb64e3a2d4e3732a59
+Source0: http://alpha.gnu.org/gnu/grub/grub-%{version}~%{rcver}.tar.gz
+# Source0-md5: bfdc87ece4fd9ec1c4104e97e5094382
Source1: update-grub
Source2: update-grub.8
Source3: grub.sysconfig
@@ -51,7 +52,6 @@
Patch6: pld-mkconfigdir.patch
Patch7: grub-mkconfig-diagnostics.patch
Patch8: ppc.patch
-Patch9: grub-1.98-follow-dev-mapper-symlinks.patch
BuildRequires: autoconf >= 2.53
BuildRequires: automake >= 1:1.11.1-1
BuildRequires: bison
@@ -184,17 +184,16 @@
avançados e que querem mais recursos de seu boot loader.
%prep
-%setup -q -n grub-%{version}
+%setup -q -n grub-%{version}~%{rcver}
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%if "%{cc_version}" < "3.4"
grep -rl -- -Wno-missing-field-initializers . | xargs sed -i -e 's,-Wno-missing-field-initializers,,'
@@ -204,7 +203,7 @@
%build
cp -f /usr/share/automake/config.sub .
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoheader}
echo timestamp > stamp-h.in
%{__autoconf}
@@ -255,11 +254,7 @@
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# deprecated. we don't need it
-rm $RPM_BUILD_ROOT/lib/update-grub_lib
-
-# no junk to /boot/grub (put to -devel?)
-rm $RPM_BUILD_ROOT%{_libexecdir}/*.h
-rm $RPM_BUILD_ROOT%{_libexecdir}/*.mk
+rm $RPM_BUILD_ROOT/boot/grub/update-grub_lib
# core.img - bootable image generated by grub-mkimage(1) via grub-install(1)
touch $RPM_BUILD_ROOT%{_libexecdir}/core.img
@@ -294,11 +289,13 @@
%attr(755,root,root) %{_sbindir}/grub-bin2h
%attr(755,root,root) %{_sbindir}/grub-editenv
%attr(755,root,root) %{_sbindir}/grub-fstest
+%attr(755,root,root) %{_sbindir}/grub-kbdcomp
%attr(755,root,root) %{_sbindir}/grub-install
+%attr(755,root,root) %{_sbindir}/grub-menulst2cfg
%attr(755,root,root) %{_sbindir}/grub-mkconfig
-%attr(755,root,root) %{_sbindir}/grub-mkelfimage
%attr(755,root,root) %{_sbindir}/grub-mkfont
-%attr(755,root,root) %{_sbindir}/grub-mkisofs
+%attr(755,root,root) %{_sbindir}/grub-mklayout
+%attr(755,root,root) %{_sbindir}/grub-mknetdir
%attr(755,root,root) %{_sbindir}/grub-mkpasswd-pbkdf2
%attr(755,root,root) %{_sbindir}/grub-mkrelpath
%attr(755,root,root) %{_sbindir}/grub-mkrescue
@@ -318,15 +315,16 @@
%{_mandir}/man1/grub-bin2h.1*
%{_mandir}/man1/grub-editenv.1*
%{_mandir}/man1/grub-fstest.1*
-%{_mandir}/man1/grub-mkelfimage.1*
+%{_mandir}/man1/grub-menulst2cfg.1*
%{_mandir}/man1/grub-mkfont.1*
-%{_mandir}/man1/grub-mkisofs.1*
+%{_mandir}/man1/grub-mklayout.1*
%{_mandir}/man1/grub-mkpasswd-pbkdf2.1*
%{_mandir}/man1/grub-mkrelpath.1*
%{_mandir}/man1/grub-mkrescue.1*
%{_mandir}/man1/grub-script-check.1*
%{_mandir}/man8/grub-install.8*
%{_mandir}/man8/grub-mkconfig.8*
+%{_mandir}/man8/grub-mknetdir.8*
%{_mandir}/man8/grub-reboot.8*
%{_mandir}/man8/grub-set-default.8*
%{_mandir}/man8/update-grub.8*
@@ -334,9 +332,9 @@
%attr(755,root,root) %{_sbindir}/grub-emu
%{_mandir}/man8/grub-emu.8*
%endif
-/lib/grub-mkconfig_lib
%dir %{_libexecdir}
+%{_libexecdir}/grub-mkconfig_lib
# XXX: check this locale dir location and if it is neccesaary to exist on /boot
%dir %{_libexecdir}/locale
%config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/grub.cfg
@@ -365,8 +363,10 @@
%doc /lib/grub.d/README
%attr(755,root,root) /lib/grub.d/00_header
%attr(755,root,root) /lib/grub.d/10_linux
+%attr(755,root,root) /lib/grub.d/20_linux_xen
%attr(755,root,root) /lib/grub.d/30_os-prober
%attr(755,root,root) /lib/grub.d/40_custom
+%attr(755,root,root) /lib/grub.d/41_custom
%dir %attr(750,root,root) %{_sysconfdir}/grub.d
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/grub.d/custom.cfg
@@ -388,6 +388,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.100 2011/09/08 11:21:08 arekm
+- up to 1.99 rc2 (1.98 on GRUB2_1_98)
+
Revision 1.99 2011/09/01 17:04:17 arekm
- release 3
================================================================
Index: packages/grub2/pld-initrd.patch
diff -u packages/grub2/pld-initrd.patch:1.1 packages/grub2/pld-initrd.patch:1.2
--- packages/grub2/pld-initrd.patch:1.1 Wed Nov 11 16:38:16 2009
+++ packages/grub2/pld-initrd.patch Thu Sep 8 13:21:08 2011
@@ -1,11 +1,12 @@
---- grub-1.97.1/util/grub.d/10_linux.in~ 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/grub.d/10_linux.in 2009-11-11 17:36:26.000000000 +0200
-@@ -77,7 +77,7 @@
-
- initrd=
- for i in "initrd.img-${version}" "initrd-${version}.img" \
-- "initrd-${version}" "initrd.img-${alt_version}" \
-+ "initrd-${version}" "initrd.img-${alt_version}" "initrd-${version}.gz" \
- "initrd-${alt_version}.img" "initrd-${alt_version}"; do
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub-garbage.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub-install.in.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub-mkconfig-diagnostics.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.99&r2=1.100&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/pld-initrd.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/pld-mkconfigdir.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/pld-sysconfdir.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list