Author: glen Date: Tue Jan 12 10:56:38 2010 GMT Module: packages Tag: HEAD ---- Log message: - move probe scripts to /lib/grub.d, /etc/grub.d now contains true configs; rel 7
---- Files affected: packages/grub2: grub2.spec (1.71 -> 1.72) , pld-mkconfigdir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/grub2/grub2.spec diff -u packages/grub2/grub2.spec:1.71 packages/grub2/grub2.spec:1.72 --- packages/grub2/grub2.spec:1.71 Sun Dec 13 19:18:08 2009 +++ packages/grub2/grub2.spec Tue Jan 12 11:56:33 2010 @@ -10,7 +10,7 @@ Summary(pt_BR.UTF-8): Gerenciador de inicialização GRUB2 Name: grub2 Version: 1.97.1 -Release: 6 +Release: 7 License: GPL v2 Group: Base Source0: http://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz @@ -18,6 +18,7 @@ Source1: update-grub Source2: update-grub.8 Source3: grub.sysconfig +Source4: grub-custom.cfg URL: http://www.gnu.org/software/grub/grub-2.en.html BuildRequires: autoconf >= 2.53 Patch0: pld-initrd.patch @@ -26,6 +27,7 @@ Patch3: grub-shelllib.patch Patch4: grub-install.in.patch Patch5: grub-lvmdevice.patch +Patch6: pld-mkconfigdir.patch BuildRequires: automake BuildRequires: bison BuildRequires: gawk @@ -140,6 +142,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build cp -f /usr/share/automake/config.sub . @@ -171,7 +174,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/sysconfig +install -d $RPM_BUILD_ROOT{/etc/sysconfig,%{_sysconfdir}/grub.d} %{__make} install \ pkgdatadir=%{_libexecdir} \ @@ -182,7 +185,9 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/update-grub cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8/update-grub.8 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/grub +cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/custom.cfg rm -f $RPM_BUILD_ROOT%{_infodir}/dir + # deprecated. we don't need it rm $RPM_BUILD_ROOT/lib/update-grub_lib @@ -257,12 +262,15 @@ %ghost %{_libexecdir}/device.map %ghost %{_libexecdir}/core.img -%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) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/grub.d/40_custom +%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_linux +%attr(755,root,root) /lib/grub.d/30_os-prober +%attr(755,root,root) /lib/grub.d/40_custom + +%dir %attr(750,root,root) /etc/grub.d +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/grub.d/custom.cfg %ifarch %{ix86} %{x8664} %attr(755,root,root) %{_sbindir}/grub-mkdevicemap @@ -281,6 +289,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.72 2010/01/12 10:56:33 glen +- move probe scripts to /lib/grub.d, /etc/grub.d now contains true configs; rel 7 + Revision 1.71 2009/12/13 18:18:08 glen - release 6 ================================================================ Index: packages/grub2/pld-mkconfigdir.patch diff -u /dev/null packages/grub2/pld-mkconfigdir.patch:1.1 --- /dev/null Tue Jan 12 11:56:39 2010 +++ packages/grub2/pld-mkconfigdir.patch Tue Jan 12 11:56:33 2010 @@ -0,0 +1,51 @@ +--- 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.97.1/Makefile.in~ 2010-01-12 12:14:39.000000000 +0200 ++++ grub-1.97.1/Makefile.in 2010-01-12 12:27:38.395326461 +0200 +@@ -282,16 +282,16 @@ + $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \ + $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \ + done +- $(SHELL) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d ++ $(SHELL) $(mkinstalldirs) $(DESTDIR)/lib/grub.d + @list='$(grub-mkconfig_SCRIPTS)'; for file in $$list; do \ + if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ + dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ +- $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \ ++ $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)/lib/grub.d/$$dest; \ + done + @list='$(grub-mkconfig_DATA)'; for file in $$list; do \ + if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ + dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ +- $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \ ++ $(INSTALL_DATA) $$dir$$file $(DESTDIR)/lib/grub.d/$$dest; \ + done + $(SHELL) $(mkinstalldirs) $(DESTDIR)/lib + @list='$(lib_SCRIPTS)'; \ +@@ -338,7 +338,7 @@ + done + @list='$(grub-mkconfig_SCRIPTS) $(grub-mkconfig_DATA)'; for file in $$list; do \ + dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ +- rm -f $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \ ++ rm -f $(DESTDIR)/lib/grub.d/$$dest; \ + done + @list='$(lib_SCRIPTS)'; \ + for file in $$list; do \ +--- grub-1.97.1/util/grub.d/40_custom.in~ 2009-11-09 17:48:16.000000000 +0200 ++++ grub-1.97.1/util/grub.d/40_custom.in 2010-01-12 12:37:52.608575356 +0200 +@@ -1,5 +1,2 @@ + #!/bin/sh +-exec tail -n +3 $0 +-# This file provides an easy way to add custom menu entries. Simply type the +-# menu entries you want to add after this comment. Be careful not to change +-# the 'exec tail' line above. ++cat /etc/grub.d/custom.cfg ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.71&r2=1.72&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
