packages: grub2/grub2.spec, grub2/grub-shelllib.patch (NEW) - no shell scri...

Tue Nov 17 11:48:48 CET 2009

Author: glen                         Date: Tue Nov 17 10:48:48 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- no shell scripts to /boot partition

---- Files affected:
packages/grub2:
   grub2.spec (1.58 -> 1.59) , grub-shelllib.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.58 packages/grub2/grub2.spec:1.59

--- packages/grub2/grub2.spec:1.58	Thu Nov 12 10:48:56 2009
+++ packages/grub2/grub2.spec	Tue Nov 17 11:48:42 2009
@@ -27,6 +27,7 @@
 Patch0:		pld-initrd.patch
 Patch1:		pld-sysconfdir.patch
 Patch2:		grub-garbage.patch
+Patch3:		grub-shelllib.patch
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	gawk
@@ -107,6 +108,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -149,7 +151,11 @@
 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/grub
 rm $RPM_BUILD_ROOT%{_infodir}/dir
 # deprecated. we don't need it
-rm $RPM_BUILD_ROOT%{_libexecdir}/update-grub_lib
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -199,7 +205,7 @@
 %ifarch ppc ppc64
 %{_libexecdir}/powerpc-*
 %endif
-%attr(755,root,root) %{_libexecdir}/*_lib
+/lib/grub-mkconfig_lib
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/grub
 %dir %{_sysconfdir}/grub.d
 %doc %{_sysconfdir}/grub.d/README
@@ -223,6 +229,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2009/11/17 10:48:42  glen
+- no shell scripts to /boot partition
+
 Revision 1.58  2009/11/12 09:48:56  glen
 - ehm, grub.cfg is not a dir
 

================================================================
Index: packages/grub2/grub-shelllib.patch
diff -u /dev/null packages/grub2/grub-shelllib.patch:1.1
--- /dev/null	Tue Nov 17 11:48:48 2009
+++ packages/grub2/grub-shelllib.patch	Tue Nov 17 11:48:42 2009
@@ -0,0 +1,137 @@
+--- grub-1.97.1/Makefile.in~	2009-11-09 17:48:15.000000000 +0200
++++ grub-1.97.1/Makefile.in	2009-11-17 12:33:36.678701742 +0200
+@@ -293,12 +293,12 @@
+ 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
+ 	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
+ 	done
+-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(libdir)/grub
++	$(SHELL) $(mkinstalldirs) $(DESTDIR)/lib
+ 	@list='$(lib_SCRIPTS)'; \
+ 	for file in $$list; do \
+ 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
+ 	  dest="`echo $$file | sed 's,.*/,,'`"; \
+-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \
++	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)/lib/$$dest; \
+ 	done
+ 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
+ 	@list='$(info_INFOS)'; \
+@@ -343,8 +343,8 @@
+ 	@list='$(lib_SCRIPTS)'; \
+ 	for file in $$list; do \
+ 	  dest="`echo $$file | sed 's,.*/,,'`"; \
+-	  echo rm -f $(DESTDIR)$(libdir)/$$dest; \
+-	  rm -f $(DESTDIR)$(libdir)/grub/$$dest; \
++	  echo rm -f $(DESTDIR)/lib/$$dest; \
++	  rm -f $(DESTDIR)/lib/$$dest; \
+ 	done
+ 	@list='$(info_INFOS)'; \
+ 	for file in $$list; do \
+--- 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}`
+ 
+-. ${libdir}/grub/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_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 @@
+ 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
+ 
+ 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@
+ 
+-. ${libdir}/grub/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/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
+@@ -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}`
+ 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 @@
+ 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"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.58&r2=1.59&f=u

