[packages/grub2/DEVEL] Up to 2.02~beta2
jajcus
jajcus at pld-linux.org
Sat Jan 4 16:46:50 CET 2014
commit b876d99a08582a590bc3dfe7a9d03039183ae808
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Sat Jan 4 15:29:08 2014 +0100
Up to 2.02~beta2
grub-lvmdevice.patch | 10 ++---
grub-mkconfig-diagnostics.patch | 90 ++++++++++++++++++++---------------------
grub2.spec | 42 +++++++++++--------
3 files changed, 75 insertions(+), 67 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index 6d31856..87962d6 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -45,24 +45,23 @@ 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: 2.00.git20131218
-Release: 0.1
+Version: 2.02
+%define beta beta2
+Release: 0.%{beta}.1
License: GPL v2
Group: Base
# git://git.savannah.gnu.org/grub.git
-# TS=$(date +'%Y%m%d') ; \
-# git archive --format=tar --prefix=grub-2.00.git$TS/ master | \
-# xz > grub-2.00.git$TS.tar.xz
-Source0: grub-%{version}.tar.xz
-# Source0-md5: 64bd6ea9d99205559fbe576ed3d80800
+# git checkout %{version}~%{beta} ; make dist
+Source0: grub-%{version}~%{beta}.tar.gz
+# Source0-md5: ca6c18f6c5f1ed05b7444017a40573d9
Source1: update-grub
Source2: update-grub.8
Source3: grub.sysconfig
Source4: grub-custom.cfg
# ./linguas.sh
# TS=$(date +'%Y%m%d') ; tar cjvf grub-po-2.00.git$TS.tar.bz2 po/*.po po/LINGUAS
-Source5: grub-po-%{version}.tar.bz2
-# Source5-md5: 274b652b6616780318cf7bd43f183ab9
+Source5: grub-po-2.02.git20140104.tar.bz2
+# Source5-md5: aeef3e636178093cf9d780d92da7afdb
Patch1: pld-sysconfdir.patch
Patch2: grub-garbage.patch
Patch3: grub-lvmdevice.patch
@@ -284,7 +283,7 @@ starfield theme for GRUB.
Motyw starfield dla GRUB-a.
%prep
-%setup -q -n grub-%{version} -a5
+%setup -q -n grub-%{version}~%{beta} -a5
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -309,8 +308,14 @@ install -d our-ld
ln -s /usr/bin/ld.bfd our-ld/ld
export PATH=$(pwd)/our-ld:$PATH
-# not only the typicall autotools stuff
-./autogen.sh
+## not only the typicall autotools stuff
+#./autogen.sh
+
+%{__gettextize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
for platform in %{platforms} ; do
install -d build-${platform}
@@ -336,6 +341,7 @@ for platform in %{platforms} ; do
$platform_opts \
TARGET_LDFLAGS=-static
+ %{__make} -C po update-gmo
%{__make}
cd ..
done
@@ -507,16 +513,18 @@ fi
%dir /lib/grub.d
%doc /lib/grub.d/README
%attr(755,root,root) /lib/grub.d/00_header
-%attr(755,root,root) /lib/grub.d/10_hurd
-%attr(755,root,root) /lib/grub.d/10_illumos
-%attr(755,root,root) /lib/grub.d/10_kfreebsd
%attr(755,root,root) /lib/grub.d/10_linux
-%attr(755,root,root) /lib/grub.d/10_netbsd
-%attr(755,root,root) /lib/grub.d/10_xnu
%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/41_custom
+# these are now installed only on matching hosts
+#%attr(755,root,root) /lib/grub.d/10_hurd
+#%attr(755,root,root) /lib/grub.d/10_illumos
+#%attr(755,root,root) /lib/grub.d/10_kfreebsd
+#%attr(755,root,root) /lib/grub.d/10_netbsd
+#%attr(755,root,root) /lib/grub.d/10_xnu
+
%ifarch %{ix86} %{x8664}
%attr(755,root,root) %{_sbindir}/grub-probe
%{_mandir}/man8/grub-probe.8*
diff --git a/grub-lvmdevice.patch b/grub-lvmdevice.patch
index cea1ebb..7b9c251 100644
--- a/grub-lvmdevice.patch
+++ b/grub-lvmdevice.patch
@@ -1,10 +1,10 @@
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub-mkconfig.in grub-2.00.git20131218/util/grub-mkconfig.in
---- grub-2.00.git20131218.orig/util/grub-mkconfig.in 2013-12-18 14:20:33.000000000 +0100
-+++ grub-2.00.git20131218/util/grub-mkconfig.in 2013-12-18 14:21:31.000000000 +0100
-@@ -138,6 +138,27 @@
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub-mkconfig.in grub-2.02~beta2/util/grub-mkconfig.in
+--- grub-2.02~beta2.orig/util/grub-mkconfig.in 2014-01-04 10:59:07.595221161 +0100
++++ grub-2.02~beta2/util/grub-mkconfig.in 2014-01-04 11:00:01.898554984 +0100
+@@ -130,6 +130,27 @@
# Device containing our userland. Typically used for root= parameter.
- GRUB_DEVICE="`${grub_probe} --target=device "$GRUB_ROOT"/`"
+ GRUB_DEVICE="`${grub_probe} --target=device /`"
+
+# Rewrite to sane LVM node (Code from PLD Linux geninitrd):
+# /dev/mapper/sys-rootfs -> /dev/sys/rootfs
diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch
index 34d7d22..94a716f 100644
--- a/grub-mkconfig-diagnostics.patch
+++ b/grub-mkconfig-diagnostics.patch
@@ -1,7 +1,7 @@
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub-mkconfig.in grub-2.00.git20131218/util/grub-mkconfig.in
---- grub-2.00.git20131218.orig/util/grub-mkconfig.in 2013-12-18 14:24:56.000000000 +0100
-+++ grub-2.00.git20131218/util/grub-mkconfig.in 2013-12-18 14:31:16.000000000 +0100
-@@ -259,11 +259,16 @@
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub-mkconfig.in grub-2.02~beta2/util/grub-mkconfig.in
+--- grub-2.02~beta2.orig/util/grub-mkconfig.in 2014-01-04 11:34:32.715240491 +0100
++++ grub-2.02~beta2/util/grub-mkconfig.in 2014-01-04 11:34:50.135240649 +0100
+@@ -250,11 +250,16 @@
if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new"
oldumask=$(umask); umask 077
@@ -20,7 +20,7 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub-mkconfig.in grub-2.00
cat << EOF
#
-@@ -325,13 +330,16 @@
+@@ -289,13 +294,16 @@
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
@@ -41,9 +41,9 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub-mkconfig.in grub-2.00
+
+# close diagnostic stream
+exec 3>&-
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/00_header.in grub-2.00.git20131218/util/grub.d/00_header.in
---- grub-2.00.git20131218.orig/util/grub.d/00_header.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/00_header.in 2013-12-18 14:29:45.000000000 +0100
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/00_header.in grub-2.02~beta2/util/grub.d/00_header.in
+--- grub-2.02~beta2.orig/util/grub.d/00_header.in 2014-01-04 10:50:51.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/00_header.in 2014-01-04 11:34:50.135240649 +0100
@@ -229,7 +229,7 @@
if [ "x$gfxterm" = x1 ]; then
if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
@@ -68,13 +68,13 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/00_header.in grub-2
esac
prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"`
cat << EOF
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_hurd.in grub-2.00.git20131218/util/grub.d/10_hurd.in
---- grub-2.00.git20131218.orig/util/grub.d/10_hurd.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_hurd.in 2013-12-18 14:32:14.000000000 +0100
-@@ -55,8 +55,8 @@
- basename=`basename "$i"`
- dirname=`dirname "$i"`
- rel_dirname=`make_system_path_relative_to_its_root "$dirname"`
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_hurd.in grub-2.02~beta2/util/grub.d/10_hurd.in
+--- grub-2.02~beta2.orig/util/grub.d/10_hurd.in 2013-12-17 18:25:57.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/10_hurd.in 2014-01-04 11:35:59.171907965 +0100
+@@ -45,8 +45,8 @@
+ basename=`basename $i`
+ dirname=`dirname $i`
+ rel_dirname=`make_system_path_relative_to_its_root $dirname`
- gettext_printf "Found GNU Mach: %s" "$i" >&2
- echo >&2
+ gettext_printf "Found GNU Mach: %s" "$i" >&3
@@ -82,10 +82,10 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_hurd.in grub-2.0
kernels="${kernels} ${rel_dirname}/${basename}"
at_least_one=true
fi
-@@ -70,8 +70,8 @@
+@@ -60,8 +60,8 @@
- for i in "$GRUB_ROOT"/hurd/${hurd_fs}.static "$GRUB_ROOT"/hurd/exec ; do
- if test -f "$i" ; then
+ for i in /hurd/${hurd_fs}.static /hurd/exec ; do
+ if test -e "$i" ; then
- gettext_printf "Found Hurd module: %s" "$i" >&2
- echo >&2
+ gettext_printf "Found Hurd module: %s" "$i" >&3
@@ -93,10 +93,10 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_hurd.in grub-2.0
at_least_one=true
else
all_of_them=false
-@@ -84,8 +84,8 @@
+@@ -74,8 +74,8 @@
fi
- if ${all_of_them} && test -f "$GRUB_ROOT"/lib/ld.so.1 ; then : ; else
+ if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else
- gettext "Some Hurd stuff found, but not enough to boot." >&2
- echo >&2
+ gettext "Some Hurd stuff found, but not enough to boot." >&3
@@ -104,10 +104,10 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_hurd.in grub-2.0
exit 1
fi
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_kfreebsd.in grub-2.00.git20131218/util/grub.d/10_kfreebsd.in
---- grub-2.00.git20131218.orig/util/grub.d/10_kfreebsd.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_kfreebsd.in 2013-12-18 14:29:45.000000000 +0100
-@@ -168,7 +168,7 @@
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in grub-2.02~beta2/util/grub.d/10_kfreebsd.in
+--- grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in 2013-12-17 18:25:57.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/10_kfreebsd.in 2014-01-04 11:34:50.135240649 +0100
+@@ -158,7 +158,7 @@
while [ "x$list" != "x" ] ; do
kfreebsd=`version_find_latest $list`
@@ -116,7 +116,7 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_kfreebsd.in grub
basename=`basename $kfreebsd`
dirname=`dirname $kfreebsd`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -217,7 +217,7 @@
+@@ -207,7 +207,7 @@
fi
done
if test -n "${module_dir}" ; then
@@ -125,10 +125,10 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_kfreebsd.in grub
module_dir_rel=$(make_system_path_relative_to_its_root $module_dir)
fi
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_linux.in grub-2.00.git20131218/util/grub.d/10_linux.in
---- grub-2.00.git20131218.orig/util/grub.d/10_linux.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_linux.in 2013-12-18 14:29:45.000000000 +0100
-@@ -189,7 +189,7 @@
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_linux.in grub-2.02~beta2/util/grub.d/10_linux.in
+--- grub-2.02~beta2.orig/util/grub.d/10_linux.in 2014-01-04 10:50:51.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/10_linux.in 2014-01-04 11:34:50.135240649 +0100
+@@ -176,7 +176,7 @@
is_top_level=true
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
@@ -137,7 +137,7 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_linux.in grub-2.
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -226,7 +226,7 @@
+@@ -213,7 +213,7 @@
fi
if test -n "${initrd}" ; then
@@ -146,10 +146,10 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_linux.in grub-2.
elif test -z "${initramfs}" ; then
# "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's
# no initrd or builtin initramfs, it can't work here.
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_netbsd.in grub-2.00.git20131218/util/grub.d/10_netbsd.in
---- grub-2.00.git20131218.orig/util/grub.d/10_netbsd.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_netbsd.in 2013-12-18 14:29:45.000000000 +0100
-@@ -166,7 +166,7 @@
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_netbsd.in grub-2.02~beta2/util/grub.d/10_netbsd.in
+--- grub-2.02~beta2.orig/util/grub.d/10_netbsd.in 2013-12-17 18:25:57.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/10_netbsd.in 2014-01-04 11:34:50.135240649 +0100
+@@ -155,7 +155,7 @@
continue
fi
@@ -158,9 +158,9 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_netbsd.in grub-2
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
netbsd_entry "knetbsd" "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}"
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_windows.in grub-2.00.git20131218/util/grub.d/10_windows.in
---- grub-2.00.git20131218.orig/util/grub.d/10_windows.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_windows.in 2013-12-18 14:29:45.000000000 +0100
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_windows.in grub-2.02~beta2/util/grub.d/10_windows.in
+--- grub-2.02~beta2.orig/util/grub.d/10_windows.in 2013-12-17 18:25:57.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/10_windows.in 2014-01-04 11:34:50.135240649 +0100
@@ -82,7 +82,7 @@
# Get boot device.
dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
@@ -170,10 +170,10 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_windows.in grub-
cat << EOF
menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
EOF
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in grub-2.00.git20131218/util/grub.d/20_linux_xen.in
---- grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/20_linux_xen.in 2013-12-18 14:29:45.000000000 +0100
-@@ -198,7 +198,7 @@
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in grub-2.02~beta2/util/grub.d/20_linux_xen.in
+--- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in 2014-01-04 10:50:51.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/20_linux_xen.in 2014-01-04 11:34:50.135240649 +0100
+@@ -204,7 +204,7 @@
fi
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
@@ -182,7 +182,7 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in gru
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -221,7 +221,7 @@
+@@ -227,7 +227,7 @@
fi
done
if test -n "${initrd}" ; then
@@ -191,9 +191,9 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in gru
else
# "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here.
linux_root_device_thisversion=${GRUB_DEVICE}
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/30_os-prober.in grub-2.00.git20131218/util/grub.d/30_os-prober.in
---- grub-2.00.git20131218.orig/util/grub.d/30_os-prober.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/30_os-prober.in 2013-12-18 14:29:45.000000000 +0100
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/30_os-prober.in grub-2.02~beta2/util/grub.d/30_os-prober.in
+--- grub-2.02~beta2.orig/util/grub.d/30_os-prober.in 2014-01-04 10:50:51.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/30_os-prober.in 2014-01-04 11:34:50.135240649 +0100
@@ -134,7 +134,7 @@
LONGNAME="${LABEL}"
fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/668ecb013f712510b23c7a72b194918eb61006ba
More information about the pld-cvs-commit
mailing list