packages: grubby/grubby-menu.lst.patch, grubby/grubby-pic.patch, grubby/gru...

glen glen at pld-linux.org
Thu May 28 00:03:27 CEST 2009 

Author: glen                         Date: Wed May 27 22:03:27 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 6.0.86

---- Files affected:
packages/grubby:
   grubby-menu.lst.patch (1.2 -> 1.3) , grubby-pic.patch (1.1 -> 1.2) , grubby.spec (1.25 -> 1.26) , TODO (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/grubby/grubby-menu.lst.patch
diff -u packages/grubby/grubby-menu.lst.patch:1.2 packages/grubby/grubby-menu.lst.patch:1.3
--- packages/grubby/grubby-menu.lst.patch:1.2	Mon Jun  6 21:07:33 2005
+++ packages/grubby/grubby-menu.lst.patch	Thu May 28 00:03:22 2009
@@ -1,21 +1,21 @@
---- mkinitrd-4.1.18/grubby/grubby.c~	2004-08-24 22:10:23.000000000 +0300
-+++ mkinitrd-4.1.18/grubby/grubby.c	2005-01-05 22:52:16.000000000 +0200
-@@ -97,7 +97,7 @@
+--- mkinitrd-6.0.86/grubby/grubby.c~	2009-05-21 22:14:01.000000000 +0300
++++ mkinitrd-6.0.86/grubby/grubby.c	2009-05-27 23:36:24.400378963 +0300
+@@ -140,7 +140,7 @@
  };
  
  struct configFileInfo grubConfigType = {
--    "/boot/grub/grub.conf",		    /* defaultConfig */
-+    "/boot/grub/menu.lst",		    /* defaultConfig */
+-    "/etc/grub.conf",			    /* defaultConfig */
++    "/boot/grub/menu.lst",			    /* defaultConfig */
      grubKeywords,			    /* keywords */
      1,					    /* defaultIsIndex */
      1,					    /* defaultSupportSaved */
---- ../grubby/new-kernel-pkg~	2005-06-01 20:06:00.000000000 +0300
-+++ ../grubby/new-kernel-pkg	2005-06-06 22:06:35.000000000 +0300
-@@ -59,7 +59,7 @@
+--- mkinitrd-6.0.86/grubby/new-kernel-pkg~	2009-05-21 22:14:01.000000000 +0300
++++ mkinitrd-6.0.86/grubby/new-kernel-pkg	2009-05-27 23:36:55.383790363 +0300
+@@ -73,7 +73,7 @@
  else
      # this leaves i?86 and x86_64
      liloConfig=/etc/lilo.conf
--    grubConfig=/boot/grub/grub.conf
+-    grubConfig=$(readlink -f /etc/grub.conf 2>/dev/null)
 +    grubConfig=/boot/grub/menu.lst
      bootPrefix=/boot
      liloFlag=lilo

================================================================
Index: packages/grubby/grubby-pic.patch
diff -u packages/grubby/grubby-pic.patch:1.1 packages/grubby/grubby-pic.patch:1.2
--- packages/grubby/grubby-pic.patch:1.1	Tue Dec 25 20:12:30 2007
+++ packages/grubby/grubby-pic.patch	Thu May 28 00:03:22 2009
@@ -15,18 +15,18 @@
  bdevid :: command.o
  	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(command_LIBS)
  
-+$(bdevid_OBJECTS) $(foreach o, $(MODULES), ${o}.o) :: CFLAGS += -fPIC
++$(bdevid_OBJECTS) $(foreach o, $(MODULES), $(o).o) :: CFLAGS += -fPIC
 +
  $(foreach lib,$(MODULES),$(lib).so) :: %.so : %.o ../nash/wrap.o libbdevidprobe.a
  	$(CC) $(LDFLAGS) -shared -Wl,-soname="$*.so.$(VERSION)" -o $@ $< ../nash/wrap.o $($*_LIBS) -lbdevidprobe
  
---- mkinitrd-6.0.24/bdevid/python/Makefile.orig	2007-12-14 21:11:23.000000000 +0100
-+++ mkinitrd-6.0.24/bdevid/python/Makefile	2007-12-25 19:41:02.229105531 +0100
-@@ -10,6 +10,7 @@
+--- mkinitrd-6.0.86/bdevid/python/Makefile~	2009-05-21 22:14:01.000000000 +0300
++++ mkinitrd-6.0.86/bdevid/python/Makefile	2009-05-27 23:38:44.594917180 +0300
+@@ -28,6 +28,7 @@
+ PYVER := $(shell python -c "import sys; print sys.version[0:3]")
  CFLAGS += -I/usr/include/python$(PYVER)
  CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include
- CFLAGS += $(shell pkg-config --cflags glib-2.0)
 +CFLAGS += -fPIC
  LDFLAGS = -shared -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid
  LDFLAGS += -Wl,-soname="pybdevid.so.$(VERSION)",--as-needed
- LDFLAGS += -lpython$(PYVER) -ldl $(shell pkg-config --libs glib-2.0)
+ LDFLAGS += -lpython$(PYVER) -ldl

================================================================
Index: packages/grubby/grubby.spec
diff -u packages/grubby/grubby.spec:1.25 packages/grubby/grubby.spec:1.26
--- packages/grubby/grubby.spec:1.25	Wed May 27 19:58:34 2009
+++ packages/grubby/grubby.spec	Thu May 28 00:03:22 2009
@@ -6,20 +6,22 @@
 Summary:	Command line tool for configuring grub, lilo, and elilo
 Summary(pl.UTF-8):	Działające z linii poleceń narzędzie do konfiguracji gruba, lilo i elilo
 Name:		grubby
-Version:	6.0.24
-Release:	4
+Version:	6.0.86
+Release:	0.5
 License:	GPL v2
 Group:		Base
 Source0:	mkinitrd-%{version}.tar.bz2
-# Source0-md5:	4bcef73138bb05da98e54cbfe48cb8f1
+# Source0-md5:	b1407f7cc45f730027d535b24c9fe2e6
 Patch0:		%{name}-menu.lst.patch
 Patch1:		%{name}-pld.patch
 Patch2:		%{name}-geninitrd.patch
 Patch3:		%{name}-c99.patch
 Patch4:		%{name}-pic.patch
+Patch5:		%{name}-nolibs.patch
 BuildRequires:	device-mapper-devel
-BuildRequires:	e2fsprogs-devel
+BuildRequires:	libblkid-devel
 BuildRequires:	libdhcp-devel > 1.9
+BuildRequires:	libnl-devel
 BuildRequires:	parted-devel >= 1.8.5
 BuildRequires:	popt-devel
 Requires:	geninitrd >= 10000.3
@@ -120,12 +122,15 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
-CFLAGS="%{rpmcflags}"; export CFLAGS
+# their flags from Makefile.inc, if problem resync
+export CFLAGS="%{rpmcflags} -Wall -g -D_FORTIFY_SOURCE=2 -Wno-unused-function -fPIC -std=gnu99 -D_GNU_SOURCE=1" 
+export LDFLAGS="%{rpmldflags} -Wl,--wrap,open,--wrap,fopen,--wrap,opendir,--wrap,socket -Wl,--wrap,pipe,--wrap,mkdir,--wrap,access" 
 %{__make} \
 	CC="%{__cc}" \
-	LIB=%{_lib}
+	LIB=%{_lib} \
 
 %if %{with tests}
 %{__make} test
@@ -141,6 +146,14 @@
 
 install installkernel $RPM_BUILD_ROOT%{_sbindir}
 
+# we don't use these
+rm -f $RPM_BUILD_ROOT%{_sbindir}/{ls,mk}initrd
+rm -f $RPM_BUILD_ROOT%{_prefix}/libexec/initrd-functions
+rm -f $RPM_BUILD_ROOT%{_prefix}/libexec/mkliveinitrd
+rm -f $RPM_BUILD_ROOT%{_sbindir}/nash
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/nash.8*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -198,6 +211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2009/05/27 22:03:22  glen
+- updated to 6.0.86
+
 Revision 1.25  2009/05/27 17:58:34  glen
 - release 4
 

================================================================
Index: packages/grubby/TODO
diff -u /dev/null packages/grubby/TODO:1.1
--- /dev/null	Thu May 28 00:03:27 2009
+++ packages/grubby/TODO	Thu May 28 00:03:22 2009
@@ -0,0 +1,9 @@
+Library symbols loop:
+Unresolved symbols found in: libnash.so.6.0.86
+        bdevid_pr_getattr                                                                                                                    
+        bdevid_module_load                                                                                                                   
+        bdevid_new                                                                                                                           
+        bdevid_destroy                                                                                                                       
+        bdevid_probe                                                                                                                         
+
+while bdevid needs nash being built first
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby-menu.lst.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby-pic.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby.spec?r1=1.25&r2=1.26&f=u

More information about the pld-cvs-commit mailing list