packages: grub2/grub2.spec, grub2/grub-install.in.patch (NEW) - restore gru...
glen
glen at pld-linux.org
Tue Nov 17 12:12:21 CET 2009
Author: glen Date: Tue Nov 17 11:12:21 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- restore grub-install.in.patch from grub-legacy
---- Files affected:
packages/grub2:
grub2.spec (1.59 -> 1.60) , grub-install.in.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.59 packages/grub2/grub2.spec:1.60
--- packages/grub2/grub2.spec:1.59 Tue Nov 17 11:48:42 2009
+++ packages/grub2/grub2.spec Tue Nov 17 12:12:15 2009
@@ -28,6 +28,7 @@
Patch1: pld-sysconfdir.patch
Patch2: grub-garbage.patch
Patch3: grub-shelllib.patch
+Patch4: grub-install.in.patch
BuildRequires: automake
BuildRequires: bison
BuildRequires: gawk
@@ -109,6 +110,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
cp -f /usr/share/automake/config.sub .
@@ -135,7 +137,8 @@
%endif
grub_emu_LDFLAGS="-s -static -lncurses -ltinfo" \
%endif
- pkgdatadir=%{_libexecdir}
+ pkgdatadir=%{_libexecdir} \
+ pkglibdir=%{_libexecdir}
%install
rm -rf $RPM_BUILD_ROOT
@@ -143,6 +146,7 @@
%{__make} install \
pkgdatadir=%{_libexecdir} \
+ pkglibdir=%{_libexecdir} \
DESTDIR=$RPM_BUILD_ROOT
cp -a docs/grub.cfg $RPM_BUILD_ROOT%{_libexecdir}
@@ -154,8 +158,8 @@
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%{_libexecdir}/*.h
+rm $RPM_BUILD_ROOT%{_libexecdir}/*.mk
%clean
rm -rf $RPM_BUILD_ROOT
@@ -169,6 +173,7 @@
%files
%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-fstest
%attr(755,root,root) %{_sbindir}/grub-install
%attr(755,root,root) %{_sbindir}/grub-mkfont
@@ -197,22 +202,26 @@
%attr(755,root,root) %{_sbindir}/grub-emu
%{_mandir}/man8/grub-emu.8*
%endif
-%config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/grub.cfg
+/lib/grub-mkconfig_lib
+
%dir %{_libexecdir}
+%config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/grub.cfg
+%{_libexecdir}/*.lst
+%{_libexecdir}/*.mod
%ifarch %{ix86} %{x8664}
-%{_libexecdir}/i386-pc
+%{_libexecdir}/*.o
%endif
-%ifarch ppc ppc64
-%{_libexecdir}/powerpc-*
+%ifarch %{ix86} %{x8664} sparc sparc64
+%{_libexecdir}/*.img
%endif
-/lib/grub-mkconfig_lib
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/grub
+
%dir %{_sysconfdir}/grub.d
%doc %{_sysconfdir}/grub.d/README
%attr(755,root,root) %{_sysconfdir}/grub.d/00_header
%attr(755,root,root) %{_sysconfdir}/grub.d/10_linux
%attr(755,root,root) %{_sysconfdir}/grub.d/30_os-prober
%attr(755,root,root) %{_sysconfdir}/grub.d/40_custom
+
%ifarch %{ix86} %{x8664}
%attr(755,root,root) %{_sbindir}/grub-mkdevicemap
%attr(755,root,root) %{_sbindir}/grub-probe
@@ -221,6 +230,7 @@
%{_mandir}/man8/grub-probe.8*
%{_mandir}/man8/grub-setup.8*
%endif
+
%{_infodir}/grub*.info*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -229,6 +239,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.60 2009/11/17 11:12:15 glen
+- restore grub-install.in.patch from grub-legacy
+
Revision 1.59 2009/11/17 10:48:42 glen
- no shell scripts to /boot partition
================================================================
Index: packages/grub2/grub-install.in.patch
diff -u /dev/null packages/grub2/grub-install.in.patch:1.1
--- /dev/null Tue Nov 17 12:12:21 2009
+++ packages/grub2/grub-install.in.patch Tue Nov 17 12:12:15 2009
@@ -0,0 +1,123 @@
+--- 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@
+ 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
+@@ -230,23 +230,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
+- fi
+-done
+-for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst; do
+- cp -f $file ${grubdir} || exit 1
+-done
+-if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
+- for file in ${pkglibdir}/*.img ${pkglibdir}/efiemu??.o; do
+- if test -f $file; then
+- cp -f $file ${grubdir} || exit 1
+- fi
+- 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@
+ 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-mkimage | sed ${transform}`
+ grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
+@@ -168,16 +168,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
+-
+ # 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
+@@ -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}`
+@@ -153,16 +153,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
+-
+ # 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
+ 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}`
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.59&r2=1.60&f=u
More information about the pld-cvs-commit
mailing list