[packages/grub2] Version: 2.00
jajcus
jajcus at pld-linux.org
Sat Oct 27 20:07:49 CEST 2012
commit 7615a8627e634cb9730ec26267bdc71954fd9b99
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Sat Oct 27 18:18:19 2012 +0200
Version: 2.00
grub-garbage.patch | 13 +-
grub-install.in.patch | 48 +++----
grub-mkconfig-diagnostics.patch | 222 +++++++++++++++---------------
grub-shelllib.patch | 291 +++++++++++++++++++++++++++++-----------
grub2-awk.patch | 9 +-
grub2-gets.patch | 11 ++
grub2.spec | 59 +++++---
pld-initrd.patch | 17 ++-
pld-mkconfigdir.patch | 32 ++---
pld-sysconfdir.patch | 30 +++--
10 files changed, 448 insertions(+), 284 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index bd34ea8..740b681 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -1,7 +1,9 @@
# TODO
+# - grub-install: source_dir doesn't exist. Please specify --target or --directory
+# - multiple targets. This functionality is reaped by our patches,
+# but is needed e.g. for reasonable EFI support
# - reap out which in probe scripts and drop R: which
# - subpackages? e.g. modules and utils
-# - subpackage for /sbin/grub-mkfont (pulls freetype lib dep)
# - check where is that locale path: /boot/grub/locale and fix it or change it
# - grubemu notes
# --enable-grub-emu-usb conflicts with --enable-grub-emu-pci, emu-pci seems experimental
@@ -10,6 +12,10 @@
# - warning: Installed (but unpackaged) file(s) found:
# /boot/grub/config.h
# /etc/bash_completion.d/grub
+# /sbin/grub-sparc64-setup
+# /boot/grub/gdb_grub
+# /boot/grub/gmodule.pl
+# /sbin/grub-sparc64-setup
#
# Conditional build:
%bcond_with grubemu # build grub-emu debugging utility
@@ -32,12 +38,12 @@ 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
Name: grub2
-Version: 1.99
-Release: 9
+Version: 2.00
+Release: 0.1
License: GPL v2
Group: Base
Source0: http://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
-# Source0-md5: 27e360b951f006c464299d06bbd63442
+# Source0-md5: a1043102fbc7bcedbf53e7ee3d17ab91
Source1: update-grub
Source2: update-grub.8
Source3: grub.sysconfig
@@ -54,7 +60,7 @@ Patch7: grub-mkconfig-diagnostics.patch
Patch8: ppc.patch
Patch9: %{name}-awk.patch
Patch10: posix.patch
-Patch11: sort-version.patch
+Patch11: %{name}-gets.patch
BuildRequires: autoconf >= 2.53
BuildRequires: automake >= 1:1.11.1-1
BuildRequires: bison
@@ -190,6 +196,13 @@ This package provides bash-completion for GRUB.
%description -n bash-completion-%{name} -l pl.UTF-8
Pakiet ten dostarcza bashowe uzupełnianie nazw dla GRUB.
+%package mkfont
+Summary: GRUB font files converter
+Group: Base
+
+%description mkfont
+Converts common font file formats into PF2.
+
%prep
%setup -q -n grub-%{version}
%patch0 -p1
@@ -246,6 +259,10 @@ rm -rf $RPM_BUILD_ROOT
pkglibdir=%{_libexecdir} \
DESTDIR=$RPM_BUILD_ROOT
+# not in Th (?)
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/de at hebrew
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/en@{arabic,cyrillic,greek,hebrew,piglatin}
+
%find_lang grub
# this must be after 'make install'
@@ -265,9 +282,6 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/grub
# rm -f, because it sometimes exists, sometimes not, depending which texlive you have installed
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-# deprecated. we don't need it
-%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/update-grub_lib
-
# core.img - bootable image generated by grub-mkimage(1) via grub-install(1)
touch $RPM_BUILD_ROOT%{_libexecdir}/core.img
touch $RPM_BUILD_ROOT%{_libexecdir}/device.map
@@ -305,19 +319,21 @@ fi
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README THANKS TODO
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/grub
-%attr(755,root,root) %{_sbindir}/grub-bin2h
+%attr(755,root,root) %{_sbindir}/grub-bios-setup
%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-mkfont
%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
+%attr(755,root,root) %{_sbindir}/grub-mkstandalone
+%attr(755,root,root) %{_sbindir}/grub-mount
+%attr(755,root,root) %{_sbindir}/grub-ofpathname
%attr(755,root,root) %{_sbindir}/grub-reboot
%attr(755,root,root) %{_sbindir}/grub-script-check
%attr(755,root,root) %{_sbindir}/grub-set-default
@@ -327,23 +343,24 @@ fi
%{_mandir}/man1/grub-mkimage.1*
%else
%attr(755,root,root) %{_sbindir}/grub-probe
-%attr(755,root,root) %{_sbindir}/grub-mkdevicemap
%{_mandir}/man8/grub-probe.8*
-%{_mandir}/man8/grub-mkdevicemap.8*
%endif
-%{_mandir}/man1/grub-bin2h.1*
%{_mandir}/man1/grub-editenv.1*
%{_mandir}/man1/grub-fstest.1*
+%{_mandir}/man1/grub-kbdcomp.1*
%{_mandir}/man1/grub-menulst2cfg.1*
-%{_mandir}/man1/grub-mkfont.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-mkstandalone.1*
+%{_mandir}/man1/grub-mount.1*
%{_mandir}/man1/grub-script-check.1*
+%{_mandir}/man8/grub-bios-setup.8*
%{_mandir}/man8/grub-install.8*
%{_mandir}/man8/grub-mkconfig.8*
%{_mandir}/man8/grub-mknetdir.8*
+%{_mandir}/man8/grub-ofpathname.8*
%{_mandir}/man8/grub-reboot.8*
%{_mandir}/man8/grub-set-default.8*
%{_mandir}/man8/update-grub.8*
@@ -359,8 +376,13 @@ fi
%dir %{_libexecdir}/locale
%config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/grub.cfg
%config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/custom.cfg
+%{_libexecdir}/modinfo.sh
+%{_libexecdir}/*.exec
+%{_libexecdir}/*.image
%{_libexecdir}/*.lst
%{_libexecdir}/*.mod
+%{_libexecdir}/*.module
+%{_libexecdir}/lzma_decompress.img
%if %{with efiemu}
%ifarch %{x8664}
%{_libexecdir}/efiemu*.o
@@ -389,16 +411,17 @@ fi
%attr(755,root,root) /lib/grub.d/41_custom
%ifarch %{ix86} %{x8664}
-%attr(755,root,root) %{_sbindir}/grub-mkdevicemap
%attr(755,root,root) %{_sbindir}/grub-probe
-%attr(755,root,root) %{_sbindir}/grub-setup
-%{_mandir}/man8/grub-mkdevicemap.8*
%{_mandir}/man8/grub-probe.8*
-%{_mandir}/man8/grub-setup.8*
%endif
%{_infodir}/grub*.info*
+%files mkfont
+%defattr(644,root,root,755)
+%{_mandir}/man1/grub-mkfont.1*
+%attr(755,root,root) %{_sbindir}/grub-mkfont
+
%files -n bash-completion-%{name}
%defattr(644,root,root,755)
/etc/bash_completion.d/grub
diff --git a/grub-garbage.patch b/grub-garbage.patch
index daf6ae8..2b6636f 100644
--- a/grub-garbage.patch
+++ b/grub-garbage.patch
@@ -1,12 +1,11 @@
---- 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
+diff -dur grub-2.00.orig/util/grub-mkconfig_lib.in grub-2.00/util/grub-mkconfig_lib.in
+--- grub-2.00.orig/util/grub-mkconfig_lib.in 2012-06-27 17:27:53.000000000 +0200
++++ grub-2.00/util/grub-mkconfig_lib.in 2012-10-27 14:55:58.226216374 +0200
+@@ -178,6 +178,7 @@
case "$1" in
*.dpkg-*) return 1 ;; # debian dpkg
-+ *.rpmnew|*.rpmsave) return 1 ;; # Fedora rpm
+ *.rpmsave|*.rpmnew) return 1 ;;
+ *.bak|*~|.*.swp) return 1 ;; # backup and swap files from editors
- README*) return 1 ;; # documentation
+ README*|*/README*) return 1 ;; # documentation
esac
else
-
diff --git a/grub-install.in.patch b/grub-install.in.patch
index 72b2976..5a03a0e 100644
--- a/grub-install.in.patch
+++ b/grub-install.in.patch
@@ -1,42 +1,35 @@
---- 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 @@
+diff -dur grub-2.00.orig/conf/Makefile.common grub-2.00/conf/Makefile.common
+--- grub-2.00.orig/conf/Makefile.common 2012-05-27 18:16:05.000000000 +0200
++++ grub-2.00/conf/Makefile.common 2012-10-27 15:00:48.537431538 +0200
+@@ -99,7 +99,7 @@
+ # Other variables
- grubconfdir = /lib/grub.d
- grubdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
--platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
-+platformdir = $(pkglibrootdir)
+ grubconfdir = $(sysconfdir)/grub.d
+-platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
++platformdir = $(pkglibdir)
+ starfielddir = $(pkgdatadir)/themes/starfield
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@
--pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`"
-+pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME} | sed ${transform}`"
- localedir="@datadir@/locale"
-
- self="`basename $0`"
-@@ -431,23 +431,6 @@
- exit 1
+diff -dur grub-2.00.orig/util/grub-install.in grub-2.00/util/grub-install.in
+--- grub-2.00.orig/util/grub-install.in 2012-06-26 23:31:03.000000000 +0200
++++ grub-2.00/util/grub-install.in 2012-10-27 15:03:21.133028965 +0200
+@@ -522,23 +522,6 @@
+ device_map=
fi
-# Copy the GRUB images to the GRUB directory.
--for file in "${grubdir}"/*.mod "${grubdir}"/*.lst "${grubdir}"/*.img "${grubdir}"/efiemu??.o; do
+-for file in "${grubdir}"/*.mod "${grubdir}"/*.lst "${grubdir}"/*.img "${grubdir}"/efiemu??.o "${grubdir}"/${grub_modinfo_target_cpu}-$grub_modinfo_platform/*.mod "${grubdir}"/${grub_modinfo_target_cpu}-$grub_modinfo_platform/*.lst "${grubdir}"/${grub_modinfo_target_cpu}-$grub_modinfo_platform/*.img "${grubdir}"/${grub_modinfo_target_cpu}-$grub_modinfo_platform/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 "${source_dir}"/*.mod "${source_dir}"/*.lst; do
+- cp -f "$file" "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" || 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 [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-pc" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "sparc64-ieee1275" ] ; then
+- for file in "${source_dir}"/*.img "${source_dir}"/efiemu??.o; do
- if test -f "$file"; then
-- cp -f "$file" "${grubdir}" || exit 1
+- cp -f "$file" "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" || exit 1
- fi
- done
-fi
@@ -44,4 +37,3 @@
# Copy gettext files
mkdir -p "${grubdir}"/locale/
for dir in "${localedir}"/*; do
-
diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch
index f665d7f..6f2ab81 100644
--- a/grub-mkconfig-diagnostics.patch
+++ b/grub-mkconfig-diagnostics.patch
@@ -1,206 +1,212 @@
---- grub-1.97.2/util/grub-mkconfig.in~ 2010-03-10 18:09:58.858434588 +0200
-+++ grub-1.97.2/util/grub-mkconfig.in 2010-03-10 18:11:34.197928250 +0200
-@@ -243,14 +243,19 @@
-
+diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
+--- grub-2.00.orig/util/grub-mkconfig.in 2012-10-27 15:05:15.000000000 +0200
++++ grub-2.00/util/grub-mkconfig.in 2012-10-27 15:14:32.787243346 +0200
+@@ -221,11 +236,16 @@
if test "x${grub_cfg}" != "x"; then
- rm -f ${grub_cfg}.new
+ rm -f "${grub_cfg}.new"
+ oldumask=$(umask); umask 077
+ # open fd &3 for diagnostic messages
+ exec 3>&1
- exec > ${grub_cfg}.new
-
- # Allow this to fail, since /boot/grub/ might need to be fatfs to support some
- # firmware implementations (e.g. OFW or EFI).
- chmod 400 ${grub_cfg}.new || grub_warn "Could not make ${grub_cfg}.new readable by only root.\
- This means that if the generated config contains a password it is readable by everyone"
+ exec > "${grub_cfg}.new"
+ umask $oldumask
+else
+ # open fd &3 for diagnostic messages
+ exec 3>&2
fi
--echo "Generating grub.cfg ..." >&2
-+echo "Generating grub.cfg ..." >&3
+-gettext "Generating grub.cfg ..." >&2
+-echo >&2
++gettext "Generating grub.cfg ..." >&3
++echo >&3
cat << EOF
#
-@@ -275,4 +280,7 @@
- mv -f ${grub_cfg}.new ${grub_cfg}
+@@ -259,12 +279,15 @@
+ gettext_printf "Syntax errors are detected in generated GRUB config file.
+ Ensure that there are no errors in /etc/sysconfig/grub
+ and /etc/grub.d/* files or please file a bug report with
+-%s file attached." "${grub_cfg}.new" >&2
++%s file attached." "${grub_cfg}.new" >&3
+ else
+ # none of the children aborted with error, install the new grub.cfg
+ mv -f ${grub_cfg}.new ${grub_cfg}
+ fi
fi
--echo "done" >&2
-+echo "done" >&3
+-gettext "done" >&2
+-echo >&2
++gettext "done" >&3
++echo >&3
+
+# close diagnostic stream
+exec 3>&-
-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
-
- if [ "x${GRUB_SERIAL_COMMAND}" = "x" ] ; then
-@@ -174,7 +174,7 @@
+diff -dur grub-2.00.orig/util/grub.d/00_header.in grub-2.00/util/grub.d/00_header.in
+--- grub-2.00.orig/util/grub.d/00_header.in 2012-05-04 01:04:39.000000000 +0200
++++ grub-2.00/util/grub.d/00_header.in 2012-10-27 15:16:00.665356307 +0200
+@@ -219,7 +219,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
+- gettext_printf "Found theme: %s\n" "$GRUB_THEME" >&2
++ gettext_printf "Found theme: %s\n" "$GRUB_THEME" >&3
+
prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"`
cat << EOF
- insmod gfxmenu
-@@ -208,12 +208,12 @@
+@@ -255,12 +255,12 @@
EOF
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
+- gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&2
++ gettext_printf "Found background: %s\n" "$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 ;;
+- *) gettext "Unsupported image format" >&2; echo >&2; exit 1 ;;
++ *) gettext "Unsupported image format" >&3; echo >&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 @@
+diff -dur grub-2.00.orig/util/grub.d/10_hurd.in grub-2.00/util/grub.d/10_hurd.in
+--- grub-2.00.orig/util/grub.d/10_hurd.in 2012-03-04 21:10:04.000000000 +0100
++++ grub-2.00/util/grub.d/10_hurd.in 2012-10-27 15:16:00.665356307 +0200
+@@ -45,8 +45,8 @@
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
+- gettext_printf "Found GNU Mach: %s" "$i" >&2
+- echo >&2
++ gettext_printf "Found GNU Mach: %s" "$i" >&3
++ echo >&3
kernels="${kernels} ${rel_dirname}/${basename}"
at_least_one=true
fi
-@@ -55,7 +55,7 @@
+@@ -60,8 +60,8 @@
for i in /hurd/${hurd_fs}.static /hurd/exec ; do
if test -e "$i" ; then
-- echo "Found Hurd module: $i" >&2
-+ echo "Found Hurd module: $i" >&3
+- gettext_printf "Found Hurd module: %s" "$i" >&2
+- echo >&2
++ gettext_printf "Found Hurd module: %s" "$i" >&3
++ echo >&3
at_least_one=true
else
all_of_them=false
-@@ -68,7 +68,7 @@
+@@ -74,8 +74,8 @@
fi
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
+- gettext "Some Hurd stuff found, but not enough to boot." >&2
+- echo >&2
++ gettext "Some Hurd stuff found, but not enough to boot." >&3
++ echo >&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 @@
+diff -dur grub-2.00.orig/util/grub.d/10_kfreebsd.in grub-2.00/util/grub.d/10_kfreebsd.in
+--- grub-2.00.orig/util/grub.d/10_kfreebsd.in 2012-03-04 22:02:30.000000000 +0100
++++ grub-2.00/util/grub.d/10_kfreebsd.in 2012-10-27 15:16:00.668689695 +0200
+@@ -158,7 +158,7 @@
while [ "x$list" != "x" ] ; do
kfreebsd=`version_find_latest $list`
-- echo "Found kernel of FreeBSD: $kfreebsd" >&2
-+ echo "Found kernel of FreeBSD: $kfreebsd" >&3
+- gettext_printf "Found kernel of FreeBSD: %s\n" "$kfreebsd" >&2
++ gettext_printf "Found kernel of FreeBSD: %s\n" "$kfreebsd" >&3
basename=`basename $kfreebsd`
dirname=`dirname $kfreebsd`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -179,7 +179,7 @@
+@@ -207,7 +207,7 @@
fi
done
if test -n "${module_dir}" ; then
-- echo "Found kernel module directory: ${module_dir}" >&2
-+ echo "Found kernel module directory: ${module_dir}" >&3
+- gettext_printf "Found kernel module directory: %s\n" "${module_dir}" >&2
++ gettext_printf "Found kernel module directory: %s\n" "${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 @@
-
+diff -dur grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in
+--- grub-2.00.orig/util/grub.d/10_linux.in 2012-10-27 15:05:15.000000000 +0200
++++ grub-2.00/util/grub.d/10_linux.in 2012-10-27 15:16:00.668689695 +0200
+@@ -182,7 +182,7 @@
+ is_first_entry=true
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
-- echo "Found linux image: $linux" >&2
-+ echo "Found linux image: $linux" >&3
+- gettext_printf "Found linux image: %s\n" "$linux" >&2
++ gettext_printf "Found linux image: %s\n" "$linux" >&3
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -169,7 +169,7 @@
+@@ -220,7 +220,7 @@
fi
if test -n "${initrd}" ; then
-- echo "Found initrd image: ${dirname}/${initrd}" >&2
-+ echo "Found initrd image: ${dirname}/${initrd}" >&3
+- gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
++ gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&3
elif test -z "${initramfs}" ; then
- # "UUID=" magic is parsed by initrd or initramfs. Since there's
+ # "UUID=" and "ZFS=" 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 @@
+diff -dur grub-2.00.orig/util/grub.d/10_netbsd.in grub-2.00/util/grub.d/10_netbsd.in
+--- grub-2.00.orig/util/grub.d/10_netbsd.in 2012-03-04 20:47:35.000000000 +0100
++++ grub-2.00/util/grub.d/10_netbsd.in 2012-10-27 15:16:00.668689695 +0200
+@@ -155,7 +155,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.
+- gettext_printf "Found NetBSD kernel: %s\n" "$k" >&2
++ gettext_printf "Found NetBSD kernel: %s\n" "$k" >&3
+
+ if [ "x$is_first_entry" = xtrue ]; then
+ netbsd_entry "knetbsd" "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}"
+diff -dur grub-2.00.orig/util/grub.d/10_windows.in grub-2.00/util/grub.d/10_windows.in
+--- grub-2.00.orig/util/grub.d/10_windows.in 2012-03-04 22:11:43.000000000 +0100
++++ grub-2.00/util/grub.d/10_windows.in 2012-10-27 15:16:00.668689695 +0200
+@@ -82,7 +82,7 @@
+ # Get boot device.
dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
-- echo "Found $OS on $drv ($dev)" >&2
-+ echo "Found $OS on $drv ($dev)" >&3
+- gettext_printf "Found %s on %s (%s)\n" "$OS" "$drv" "$dev" >&2
++ gettext_printf "Found %s on %s (%s)\n" "$OS" "$drv" "$dev" >&3
cat << EOF
- menuentry "$OS" {
+ menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
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}\" {"
+diff -dur grub-2.00.orig/util/grub.d/20_linux_xen.in grub-2.00/util/grub.d/20_linux_xen.in
+--- grub-2.00.orig/util/grub.d/20_linux_xen.in 2012-06-03 21:57:42.000000000 +0200
++++ grub-2.00/util/grub.d/20_linux_xen.in 2012-10-27 15:16:00.672023083 +0200
+@@ -203,7 +203,7 @@
+ fi
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
-- echo "Found linux image: $linux" >&2
-+ echo "Found linux image: $linux" >&3
+- gettext_printf "Found linux image: %s\n" "$linux" >&2
++ gettext_printf "Found linux image: %s\n" "$linux" >&3
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -154,7 +154,7 @@
+@@ -226,7 +226,7 @@
fi
done
if test -n "${initrd}" ; then
-- echo "Found initrd image: ${dirname}/${initrd}" >&2
-+ echo "Found initrd image: ${dirname}/${initrd}" >&3
+- gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
++ gettext_printf "Found initrd image: %s\n" "${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 @@
+diff -dur grub-2.00.orig/util/grub.d/30_os-prober.in grub-2.00/util/grub.d/30_os-prober.in
+--- grub-2.00.orig/util/grub.d/30_os-prober.in 2012-03-04 21:52:03.000000000 +0100
++++ grub-2.00/util/grub.d/30_os-prober.in 2012-10-27 15:16:00.675356471 +0200
+@@ -117,7 +117,7 @@
LONGNAME="${LABEL}"
fi
-- echo "Found ${LONGNAME} on ${DEVICE}" >&2
-+ echo "Found ${LONGNAME} on ${DEVICE}" >&3
+- gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&2
++ gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&3
case ${BOOT} in
chain)
-@@ -198,7 +198,7 @@
- EOF
- ;;
+@@ -267,7 +267,7 @@
*)
-- echo " ${LONGNAME} is not yet supported by grub-mkconfig." >&2
-+ echo " ${LONGNAME} is not yet supported by grub-mkconfig." >&3
+ echo -n " "
+ # TRANSLATORS: %s is replaced by OS name.
+- gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2
++ gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&3
;;
esac
done
diff --git a/grub-shelllib.patch b/grub-shelllib.patch
index bffb199..0c8b065 100644
--- a/grub-shelllib.patch
+++ b/grub-shelllib.patch
@@ -1,100 +1,229 @@
---- grub-1.99/Makefile.am~ 2011-04-16 15:29:09.000000000 +0200
-+++ grub-1.99/Makefile.am 2011-09-08 15:18:49.286379677 +0200
-@@ -101,7 +101,8 @@
+diff -dur grub-2.00.orig/Makefile.am grub-2.00/Makefile.am
+--- grub-2.00.orig/Makefile.am 2012-06-26 04:07:30.000000000 +0200
++++ grub-2.00/Makefile.am 2012-10-27 16:05:36.203732745 +0200
+@@ -122,7 +122,8 @@
# Install config.h into platformdir
platform_HEADERS = config.h
--pkglib_DATA += grub-mkconfig_lib
+-pkgdata_DATA += grub-mkconfig_lib
+ulibdir = /lib
+ulib_DATA = grub-mkconfig_lib
- pkglib_DATA += update-grub_lib
---- grub-1.97.1.shelllib/util/grub.d/00_header.in 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/grub.d/00_header.in 2009-11-17 12:34:23.164322142 +0200
-@@ -23,7 +23,7 @@
- libdir=@libdir@
- grub_prefix=`echo /boot/grub | sed ${transform}`
+ if COND_i386_coreboot
+diff -dur grub-2.00.orig/util/grub-install.in grub-2.00/util/grub-install.in
+--- grub-2.00.orig/util/grub-install.in 2012-06-26 23:31:03.000000000 +0200
++++ grub-2.00/util/grub-install.in 2012-10-27 16:04:14.446027790 +0200
+@@ -76,7 +76,7 @@
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
+ disk_module=unspecified
+
+-. "${pkgdatadir}/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ # Usage: usage
+ # Print the usage.
+diff -dur grub-2.00.orig/util/grub-kbdcomp.in grub-2.00/util/grub-kbdcomp.in
+--- grub-2.00.orig/util/grub-kbdcomp.in 2012-04-05 19:56:36.000000000 +0200
++++ grub-2.00/util/grub-kbdcomp.in 2012-10-27 16:04:14.446027790 +0200
+@@ -18,7 +18,7 @@
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+-. "${pkgdatadir}/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ self=`basename $0`
+
+diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
+--- grub-2.00.orig/util/grub-mkconfig.in 2012-10-27 16:01:08.000000000 +0200
++++ grub-2.00/util/grub-mkconfig.in 2012-10-27 16:04:14.449361166 +0200
+@@ -46,7 +46,7 @@
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+-. "${pkgdatadir}/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ # Usage: usage
+ # Print the usage.
+diff -dur grub-2.00.orig/util/grub-mknetdir.in grub-2.00/util/grub-mknetdir.in
+--- grub-2.00.orig/util/grub-mknetdir.in 2012-04-11 22:36:24.000000000 +0200
++++ grub-2.00/util/grub-mknetdir.in 2012-10-27 16:04:14.449361166 +0200
+@@ -56,7 +56,7 @@
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+-. "${pkgdatadir}/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ # Usage: usage
+ # Print the usage.
+diff -dur grub-2.00.orig/util/grub-mkrescue.in grub-2.00/util/grub-mkrescue.in
+--- grub-2.00.orig/util/grub-mkrescue.in 2012-06-14 19:25:07.000000000 +0200
++++ grub-2.00/util/grub-mkrescue.in 2012-10-27 16:04:14.452694542 +0200
+@@ -58,7 +58,7 @@
+
+ localedir="@datadir@/locale"
+
+-. "${pkgdatadir}/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ # Usage: usage
+ # Print the usage.
+diff -dur grub-2.00.orig/util/grub-mkstandalone.in grub-2.00/util/grub-mkstandalone.in
+--- grub-2.00.orig/util/grub-mkstandalone.in 2012-04-05 19:54:27.000000000 +0200
++++ grub-2.00/util/grub-mkstandalone.in 2012-10-27 16:04:14.452694542 +0200
+@@ -46,7 +46,7 @@
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+-. "${pkgdatadir}/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ # Usage: usage
+ # Print the usage.
+diff -dur grub-2.00.orig/util/grub-reboot.in grub-2.00/util/grub-reboot.in
+--- grub-2.00.orig/util/grub-reboot.in 2012-04-05 19:55:31.000000000 +0200
++++ grub-2.00/util/grub-reboot.in 2012-10-27 16:04:14.456027917 +0200
+@@ -40,7 +40,7 @@
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+-. "${pkgdatadir}/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ # Usage: usage
+ # Print the usage.
+diff -dur grub-2.00.orig/util/grub-set-default.in grub-2.00/util/grub-set-default.in
+--- grub-2.00.orig/util/grub-set-default.in 2012-04-05 19:42:05.000000000 +0200
++++ grub-2.00/util/grub-set-default.in 2012-10-27 16:04:14.456027917 +0200
+@@ -40,7 +40,7 @@
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+-. "${pkgdatadir}/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ # Usage: usage
+ # Print the usage.
+diff -dur grub-2.00.orig/util/grub.d/00_header.in grub-2.00/util/grub.d/00_header.in
+--- grub-2.00.orig/util/grub.d/00_header.in 2012-05-04 01:04:39.000000000 +0200
++++ grub-2.00/util/grub.d/00_header.in 2012-10-27 16:03:01.041766812 +0200
+@@ -27,7 +27,7 @@
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
# Do this as early as possible, since other commands might depend on it.
# (e.g. the `loadfont' command might need lvm or raid modules)
---- grub-1.97.1.shelllib/util/grub.d/10_hurd.in 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/grub.d/10_hurd.in 2009-11-17 12:34:23.160988747 +0200
-@@ -19,7 +19,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
-
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
- OS=GNU
---- grub-1.97.1.shelllib/util/grub.d/10_linux.in 2009-11-17 12:34:05.445365474 +0200
-+++ grub-1.97.1/util/grub.d/10_linux.in 2009-11-17 12:34:23.160988747 +0200
-@@ -19,7 +19,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
-
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
- OS=GNU/Linux
---- grub-1.97.1.shelllib/util/grub.d/10_windows.in 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/grub.d/10_windows.in 2009-11-17 12:34:23.160988747 +0200
-@@ -19,7 +19,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
+diff -dur grub-2.00.orig/util/grub.d/10_hurd.in grub-2.00/util/grub.d/10_hurd.in
+--- grub-2.00.orig/util/grub.d/10_hurd.in 2012-03-04 21:10:04.000000000 +0100
++++ grub-2.00/util/grub.d/10_hurd.in 2012-10-27 16:03:01.045100187 +0200
+@@ -24,7 +24,7 @@
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ CLASS="--class gnu --class os"
+
+diff -dur grub-2.00.orig/util/grub.d/10_illumos.in grub-2.00/util/grub.d/10_illumos.in
+--- grub-2.00.orig/util/grub.d/10_illumos.in 2012-03-04 20:03:38.000000000 +0100
++++ grub-2.00/util/grub.d/10_illumos.in 2012-10-27 16:03:01.045100187 +0200
+@@ -20,7 +20,7 @@
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
+-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+diff -dur grub-2.00.orig/util/grub.d/10_kfreebsd.in grub-2.00/util/grub.d/10_kfreebsd.in
+--- grub-2.00.orig/util/grub.d/10_kfreebsd.in 2012-03-04 22:02:30.000000000 +0100
++++ grub-2.00/util/grub.d/10_kfreebsd.in 2012-10-27 16:03:01.045100187 +0200
+@@ -20,7 +20,7 @@
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
+-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+diff -dur grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in
+--- grub-2.00.orig/util/grub.d/10_linux.in 2012-10-27 16:01:08.000000000 +0200
++++ grub-2.00/util/grub.d/10_linux.in 2012-10-27 16:03:01.048433562 +0200
+@@ -21,7 +21,7 @@
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
+
+-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+diff -dur grub-2.00.orig/util/grub.d/10_netbsd.in grub-2.00/util/grub.d/10_netbsd.in
+--- grub-2.00.orig/util/grub.d/10_netbsd.in 2012-03-04 20:47:35.000000000 +0100
++++ grub-2.00/util/grub.d/10_netbsd.in 2012-10-27 16:03:01.048433562 +0200
+@@ -20,7 +20,7 @@
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
+-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+diff -dur grub-2.00.orig/util/grub.d/10_windows.in grub-2.00/util/grub.d/10_windows.in
+--- grub-2.00.orig/util/grub.d/10_windows.in 2012-03-04 22:11:43.000000000 +0100
++++ grub-2.00/util/grub.d/10_windows.in 2012-10-27 16:03:01.048433562 +0200
+@@ -24,7 +24,7 @@
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
case "`uname 2>/dev/null`" in
CYGWIN*) ;;
---- grub-1.97.1.shelllib/util/grub.d/30_os-prober.in 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/grub.d/30_os-prober.in 2009-11-17 12:34:23.164322142 +0200
-@@ -20,7 +20,7 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
+diff -dur grub-2.00.orig/util/grub.d/10_xnu.in grub-2.00/util/grub.d/10_xnu.in
+--- grub-2.00.orig/util/grub.d/10_xnu.in 2012-05-29 12:31:03.000000000 +0200
++++ grub-2.00/util/grub.d/10_xnu.in 2012-10-27 16:03:01.048433562 +0200
+@@ -24,7 +24,7 @@
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
+-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
- if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
- exit 0
---- grub-1.97.1.shelllib/util/grub-mkconfig.in 2009-11-17 12:34:05.448699048 +0200
-+++ grub-1.97.1/util/grub-mkconfig.in 2009-11-17 12:34:23.167655247 +0200
-@@ -73,7 +73,7 @@
- esac
- done
-
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
-
- if [ "x$EUID" = "x" ] ; then
- EUID=`id -u`
---- grub-1.97.1.shelllib/util/update-grub_lib.in 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/update-grub_lib.in 2009-11-17 12:34:23.157655729 +0200
-@@ -18,6 +18,6 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
-
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
-
- grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"
---- grub-1.99/util/grub.d/20_linux_xen.in~ 2011-04-13 21:20:29.000000000 +0200
-+++ grub-1.99/util/grub.d/20_linux_xen.in 2011-09-08 17:52:27.113229582 +0200
+ osx_entry() {
+ if [ x$2 = x32 ]; then
+diff -dur grub-2.00.orig/util/grub.d/20_linux_xen.in grub-2.00/util/grub.d/20_linux_xen.in
+--- grub-2.00.orig/util/grub.d/20_linux_xen.in 2012-06-03 21:57:42.000000000 +0200
++++ grub-2.00/util/grub.d/20_linux_xen.in 2012-10-27 16:03:01.051766938 +0200
@@ -21,7 +21,7 @@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
- libdir=@libdir@
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
+-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+diff -dur grub-2.00.orig/util/grub.d/30_os-prober.in grub-2.00/util/grub.d/30_os-prober.in
+--- grub-2.00.orig/util/grub.d/30_os-prober.in 2012-03-04 21:52:03.000000000 +0100
++++ grub-2.00/util/grub.d/30_os-prober.in 2012-10-27 16:03:01.051766938 +0200
+@@ -24,7 +24,7 @@
export TEXTDOMAIN=@PACKAGE@
- export TEXTDOMAINDIR=@localedir@
-
+ export TEXTDOMAINDIR="@localedir@"
+
+-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
++. "/lib/grub-mkconfig_lib"
+
+ if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
+ exit 0
diff --git a/grub2-awk.patch b/grub2-awk.patch
index 1be597a..162fa5c 100644
--- a/grub2-awk.patch
+++ b/grub2-awk.patch
@@ -1,9 +1,10 @@
---- grub-1.99/grub-core/Makefile.am~ 2011-04-08 13:18:05.000000000 +0200
-+++ grub-1.99/grub-core/Makefile.am 2011-09-20 08:58:09.534352571 +0200
-@@ -298,7 +298,7 @@
+diff -dur grub-2.00.orig/grub-core/Makefile.am grub-2.00/grub-core/Makefile.am
+--- grub-2.00.orig/grub-core/Makefile.am 2012-06-26 01:56:55.000000000 +0200
++++ grub-2.00/grub-core/Makefile.am 2012-10-27 15:19:54.321231750 +0200
+@@ -349,7 +349,7 @@
# generate global module dependencies list
- moddep.lst: syminfo.lst genmoddep.awk
+ moddep.lst: syminfo.lst genmoddep.awk video.lst
- cat $< | sort | awk -f $(srcdir)/genmoddep.awk > $@ || (rm -f $@; exit 1)
+ cat $< | sort | $(AWK) -f $(srcdir)/genmoddep.awk > $@ || (rm -f $@; exit 1)
platform_DATA += moddep.lst
diff --git a/grub2-gets.patch b/grub2-gets.patch
new file mode 100644
index 0000000..d74b1a7
--- /dev/null
+++ b/grub2-gets.patch
@@ -0,0 +1,11 @@
+diff -dur grub-2.00.orig/grub-core/gnulib/stdio.in.h grub-2.00/grub-core/gnulib/stdio.in.h
+--- grub-2.00.orig/grub-core/gnulib/stdio.in.h 2010-12-01 15:45:43.000000000 +0100
++++ grub-2.00/grub-core/gnulib/stdio.in.h 2012-10-27 15:43:17.539201562 +0200
+@@ -141,7 +141,6 @@
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
diff --git a/pld-initrd.patch b/pld-initrd.patch
index 8cd4747..bb55d1c 100644
--- a/pld-initrd.patch
+++ b/pld-initrd.patch
@@ -1,12 +1,11 @@
---- grub-1.99~rc2/util/grub.d/10_linux.in~ 2011-04-18 23:18:49.000000000 +0200
-+++ grub-1.99~rc2/util/grub.d/10_linux.in 2011-09-06 22:11:40.394828573 +0200
-@@ -148,7 +148,7 @@
- "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+diff -dur grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in
+--- grub-2.00.orig/util/grub.d/10_linux.in 2012-04-18 23:24:38.000000000 +0200
++++ grub-2.00/util/grub.d/10_linux.in 2012-10-27 14:36:58.131180820 +0200
+@@ -197,6 +197,7 @@
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
"initramfs-genkernel-${version}" \
-- "initramfs-genkernel-${alt_version}"; do
-+ "initramfs-genkernel-${alt_version}" "initrd-${version}.gz"; do
+ "initramfs-genkernel-${alt_version}" \
++ "initrd-${version}.gz" \
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
if test -e "${dirname}/${i}" ; then
- initrd="$i"
- break
-
diff --git a/pld-mkconfigdir.patch b/pld-mkconfigdir.patch
index e8bc48e..b80181b 100644
--- a/pld-mkconfigdir.patch
+++ b/pld-mkconfigdir.patch
@@ -1,22 +1,24 @@
---- grub-1.97.1/util/grub-mkconfig.in~ 2010-01-12 12:14:40.000000000 +0200
-+++ grub-1.97.1/util/grub-mkconfig.in 2010-01-12 12:26:24.581982969 +0200
-@@ -29,7 +29,7 @@
- pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
- grub_prefix=`echo /boot/grub | sed ${transform}`
- grub_cfg=""
--grub_mkconfig_dir=${sysconfdir}/grub.d
-+grub_mkconfig_dir=/lib/grub.d
-
- grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
- grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
---- grub-1.99~rc2/conf/Makefile.common~ 2011-04-08 13:45:13.000000000 +0200
-+++ grub-1.99~rc2/conf/Makefile.common 2011-09-06 22:41:28.748549197 +0200
+diff -dur grub-2.00.orig/conf/Makefile.common grub-2.00/conf/Makefile.common
+--- grub-2.00.orig/conf/Makefile.common 2012-10-27 15:05:15.000000000 +0200
++++ grub-2.00/conf/Makefile.common 2012-10-27 15:06:09.135719113 +0200
@@ -98,7 +98,7 @@
# Other variables
-grubconfdir = $(sysconfdir)/grub.d
+grubconfdir = /lib/grub.d
- grubdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
- platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
+ platformdir = $(pkglibdir)
+ starfielddir = $(pkgdatadir)/themes/starfield
+
+diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
+--- grub-2.00.orig/util/grub-mkconfig.in 2012-10-27 15:05:15.000000000 +0200
++++ grub-2.00/util/grub-mkconfig.in 2012-10-27 15:06:40.696227008 +0200
+@@ -35,7 +35,7 @@
+ pkgdatadir="${datadir}/@PACKAGE@"
+ fi
+ grub_cfg=""
+-grub_mkconfig_dir="${sysconfdir}"/grub.d
++grub_mkconfig_dir=/lib/grub.d
+
+ self=`basename $0`
diff --git a/pld-sysconfdir.patch b/pld-sysconfdir.patch
index 00b6382..f53f128 100644
--- a/pld-sysconfdir.patch
+++ b/pld-sysconfdir.patch
@@ -1,8 +1,9 @@
---- grub-1.97.1/util/grub-mkconfig.in~ 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/grub-mkconfig.in 2009-11-11 18:34:43.197334162 +0200
-@@ -130,8 +130,8 @@
+diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
+--- grub-2.00.orig/util/grub-mkconfig.in 2012-04-05 19:41:07.000000000 +0200
++++ grub-2.00/util/grub-mkconfig.in 2012-10-27 14:53:33.483981202 +0200
+@@ -140,8 +140,8 @@
# choosing Hurd filesystem module.
- GRUB_FS="`${grub_probe} --target=fs / 2> /dev/null || echo unknown`"
+ GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
-if test -f ${sysconfdir}/default/grub ; then
- . ${sysconfdir}/default/grub
@@ -11,7 +12,7 @@
fi
# XXX: should this be deprecated at some point?
-@@ -272,7 +272,7 @@
+@@ -232,7 +232,7 @@
# DO NOT EDIT THIS FILE
#
# It is automatically generated by $self using templates
@@ -20,17 +21,18 @@
#
EOF
-@@ -296,7 +296,7 @@
- if test "x${grub_cfg}" != "x" ; then
+@@ -257,7 +257,7 @@
if ! ${grub_script_check} ${grub_cfg}.new; then
- echo "Syntax errors are detected in generated GRUB config file." >&2
-- echo "Ensure that there are no errors in /etc/default/grub" >&2
-+ echo "Ensure that there are no errors in /etc/sysconfig/grub" >&2
- echo "and /etc/grub.d/* files or please file a bug report with" >&2
- echo "${grub_cfg}.new file attached." >&2
+ # TRANSLATORS: %s is replaced by filename
+ gettext_printf "Syntax errors are detected in generated GRUB config file.
+-Ensure that there are no errors in /etc/default/grub
++Ensure that there are no errors in /etc/sysconfig/grub
+ and /etc/grub.d/* files or please file a bug report with
+ %s file attached." "${grub_cfg}.new" >&2
else
---- grub-1.97.2/util/grub.d/README~ 2010-01-24 20:13:30.000000000 +0200
-+++ grub-1.97.2/util/grub.d/README 2010-03-10 18:25:39.418965379 +0200
+diff -dur grub-2.00.orig/util/grub.d/README grub-2.00/util/grub.d/README
+--- grub-2.00.orig/util/grub.d/README 2010-12-01 15:45:43.000000000 +0100
++++ grub-2.00/util/grub.d/README 2012-10-27 14:52:54.046709588 +0200
@@ -8,4 +8,4 @@
The number namespace in-between is configurable by system installer and/or
administrator. For example, you can add an entry to boot another OS as
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/1536aaf2ef81965c6f99c0dcf508a3629451e402
More information about the pld-cvs-commit
mailing list