packages: grub2/grub2.spec, grub2/grub-install.in.patch, grub2/grub-mkconfi...
shadzik
shadzik at pld-linux.org
Fri May 21 23:14:08 CEST 2010
Author: shadzik Date: Fri May 21 21:14:08 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.98
- rel 0.1 - grub-emu doesn't exist?
---- Files affected:
packages/grub2:
grub2.spec (1.76 -> 1.77) , grub-install.in.patch (1.1 -> 1.2) , grub-mkconfig-diagnostics.patch (1.1 -> 1.2) , grub-shelllib.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.76 packages/grub2/grub2.spec:1.77
--- packages/grub2/grub2.spec:1.76 Tue Mar 16 17:25:01 2010
+++ packages/grub2/grub2.spec Fri May 21 23:14:02 2010
@@ -13,12 +13,12 @@
Summary(pl.UTF-8): GRUB2 - bootloader dla x86 i ppc
Summary(pt_BR.UTF-8): Gerenciador de inicialização GRUB2
Name: grub2
-Version: 1.97.2
-Release: 2
+Version: 1.98
+Release: 0.1
License: GPL v2
Group: Base
Source0: http://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz
-# Source0-md5: db4d23fb8897523a7e484e974ae3d1c9
+# Source0-md5: c0bcf60e524739bb64e3a2d4e3732a59
Source1: update-grub
Source2: update-grub.8
Source3: grub.sysconfig
@@ -181,7 +181,11 @@
# mawk stalls at ./genmoddep.awk, so force gawk
AWK=gawk \
%configure \
-%{?with_grubemu:--enable-grub-emu} \
+%if %{with grubemu}
+ --enable-grub-emu-usb \
+ --enable-grub-emu-sdl \
+ --enable-grub-emu-pci \
+%endif
BUILD_CFLAGS="$CFLAGS"
%{__make} -j1 \
BUILD_CFLAGS="$CFLAGS" \
@@ -262,8 +266,8 @@
%{_mandir}/man1/grub-mkelfimage.1*
%{_mandir}/man8/update-grub.8*
%if %{with grubemu}
-%attr(755,root,root) %{_sbindir}/grub-emu
-%{_mandir}/man8/grub-emu.8*
+#%attr(755,root,root) %{_sbindir}/grub-emu
+#%{_mandir}/man8/grub-emu.8*
%endif
/lib/grub-mkconfig_lib
@@ -314,6 +318,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.77 2010/05/21 21:14:02 shadzik
+- up to 1.98
+- rel 0.1 - grub-emu doesn't exist?
+
Revision 1.76 2010/03/16 16:25:01 uzsolt
- hu
- todo about subpackages
================================================================
Index: packages/grub2/grub-install.in.patch
diff -u packages/grub2/grub-install.in.patch:1.1 packages/grub2/grub-install.in.patch:1.2
--- packages/grub2/grub-install.in.patch:1.1 Tue Nov 17 12:12:15 2009
+++ packages/grub2/grub-install.in.patch Fri May 21 23:14:03 2010
@@ -1,15 +1,15 @@
---- grub-1.97.1/util/i386/pc/grub-install.in~ 2009-11-17 12:50:34.000000000 +0200
-+++ grub-1.97.1/util/i386/pc/grub-install.in 2009-11-17 12:50:56.247556266 +0200
-@@ -29,7 +29,7 @@
- PACKAGE_VERSION=@PACKAGE_VERSION@
- target_cpu=@target_cpu@
+--- 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
+@@ -31,7 +31,7 @@
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}`
- # for make_system_path_relative_to_its_root()
- . /lib/grub-mkconfig_lib
-@@ -230,23 +230,6 @@
+ 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 @@
exit 1
fi
@@ -22,7 +22,7 @@
-for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst; do
- cp -f $file ${grubdir} || exit 1
-done
--if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
+-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
@@ -30,21 +30,21 @@
- done
-fi
-
- # Write device to a variable so we don't have to traverse /dev every time.
- grub_device=`$grub_probe --target=device ${grubdir}`
-
---- grub-1.97.1/util/i386/efi/grub-install.in~ 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/i386/efi/grub-install.in 2009-11-17 12:51:29.340886271 +0200
-@@ -29,7 +29,7 @@
- PACKAGE_VERSION=@PACKAGE_VERSION@
+ # 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}`
-@@ -168,16 +168,6 @@
+@@ -170,16 +170,6 @@
exit 1
fi
@@ -58,11 +58,11 @@
- cp -f $file ${grubdir} || exit 1
-done
-
- # Create the core image. First, auto-detect the filesystem module.
- fs_module=`$grub_probe --target=fs --device-map=${device_map} ${grubdir}`
- if test "x$fs_module" = xfat; then :; else
---- grub-1.97.1/util/ieee1275/grub-install.in~ 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/ieee1275/grub-install.in 2009-11-17 12:51:47.850884103 +0200
+ # 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@
@@ -72,7 +72,7 @@
grub_mkimage=${bindir}/`echo grub-mkelfimage | sed ${transform}`
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
-@@ -153,16 +153,6 @@
+@@ -154,16 +154,6 @@
$grub_mkdevicemap --device-map=$device_map $no_floppy || exit 1
fi
@@ -86,38 +86,6 @@
- cp -f $file ${grubdir} || exit 1
-done
-
- # Create the core image. First, auto-detect the filesystem module.
- fs_module=`$grub_probe --target=fs --device-map=${device_map} ${grubdir}`
- if test "x$fs_module" = x -a "x$modules" = x; then
---- grub-1.97.1/util/sparc64/ieee1275/grub-install.in~ 2009-11-17 12:49:04.000000000 +0200
-+++ grub-1.97.1/util/sparc64/ieee1275/grub-install.in 2009-11-17 12:52:06.784216442 +0200
-@@ -29,7 +29,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}`
-
- # for make_system_path_relative_to_its_root()
- . /lib/grub-mkconfig_lib
-@@ -192,20 +192,6 @@
- exit 1
+ if ! test -f ${grubdir}/grubenv; then
+ $grub_editenv ${grubdir}/grubenv create
fi
-
--# Copy the GRUB images to the GRUB directory.
--for file in ${grubdir}/*.mod ${grubdir}/*.lst ${grubdir}/*.img; 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
--
--for file in ${pkglibdir}/*.img; do
-- cp -f $file ${grubdir} || exit 1
--done
--
- # Write device to a variable so we don't have to traverse /dev every time.
- grub_device=`$grub_probe --target=device ${grubdir}`
-
================================================================
Index: packages/grub2/grub-mkconfig-diagnostics.patch
diff -u packages/grub2/grub-mkconfig-diagnostics.patch:1.1 packages/grub2/grub-mkconfig-diagnostics.patch:1.2
--- packages/grub2/grub-mkconfig-diagnostics.patch:1.1 Wed Mar 10 17:28:56 2010
+++ packages/grub2/grub-mkconfig-diagnostics.patch Fri May 21 23:14:03 2010
@@ -61,17 +61,6 @@
case ${BOOT} in
chain)
---- grub-1.97.2/util/grub.d/10_freebsd.in~ 2010-03-10 18:15:07.000000000 +0200
-+++ grub-1.97.2/util/grub.d/10_freebsd.in 2010-03-10 18:23:16.077575128 +0200
-@@ -38,7 +38,7 @@
- fi
-
- if [ "x$kfreebsd" != "x" ] ; then
-- echo "Found kernel of FreeBSD: $kfreebsd" >&2
-+ echo "Found kernel of FreeBSD: $kfreebsd" >&3
-
- kfreebsd_basename=`basename $kfreebsd`
- kfreebsd_dirname=`dirname $kfreebsd`
--- 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 @@
================================================================
Index: packages/grub2/grub-shelllib.patch
diff -u packages/grub2/grub-shelllib.patch:1.1 packages/grub2/grub-shelllib.patch:1.2
--- packages/grub2/grub-shelllib.patch:1.1 Tue Nov 17 11:48:42 2009
+++ packages/grub2/grub-shelllib.patch Fri May 21 23:14:03 2010
@@ -37,17 +37,6 @@
# 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_freebsd.in 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/grub.d/10_freebsd.in 2009-11-17 12:34:23.164322142 +0200
-@@ -19,7 +19,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
-
- case "${GRUB_DISTRIBUTOR}" in
- Debian) OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD" ;;
--- 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 @@
@@ -103,8 +92,8 @@
if [ "x$EUID" = "x" ] ; then
EUID=`id -u`
---- grub-1.97.1.shelllib/util/i386/pc/grub-install.in 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/i386/pc/grub-install.in 2009-11-17 12:34:23.157655729 +0200
+--- grub-1.97.1.shelllib/util/grub-install.in 2009-11-09 17:48:16.000000000 +0200
++++ grub-1.97.1/util/grub-install.in 2009-11-17 12:34:23.157655729 +0200
@@ -32,7 +32,7 @@
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
@@ -114,17 +103,6 @@
grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
---- grub-1.97.1.shelllib/util/sparc64/ieee1275/grub-install.in 2009-11-09 17:48:16.000000000 +0200
-+++ grub-1.97.1/util/sparc64/ieee1275/grub-install.in 2009-11-17 12:34:23.160988747 +0200
-@@ -32,7 +32,7 @@
- pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
-
- # for make_system_path_relative_to_its_root()
--. ${libdir}/grub/grub-mkconfig_lib
-+. /lib/grub-mkconfig_lib
-
- grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
- grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
--- 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 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.76&r2=1.77&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub-install.in.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub-mkconfig-diagnostics.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub-shelllib.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list