packages: geninitrd/geninitrd-svn.patch, geninitrd/geninitrd.spec - rel 4; ...

arekm arekm at pld-linux.org
Wed Nov 9 19:21:29 CET 2011


Author: arekm                        Date: Wed Nov  9 18:21:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; fix strip to work also with compressed modules

---- Files affected:
packages/geninitrd:
   geninitrd-svn.patch (2.10 -> 2.11) , geninitrd.spec (2.190 -> 2.191) 

---- Diffs:

================================================================
Index: packages/geninitrd/geninitrd-svn.patch
diff -u packages/geninitrd/geninitrd-svn.patch:2.10 packages/geninitrd/geninitrd-svn.patch:2.11
--- packages/geninitrd/geninitrd-svn.patch:2.10	Tue Nov  8 22:10:09 2011
+++ packages/geninitrd/geninitrd-svn.patch	Wed Nov  9 19:21:23 2011
@@ -82,13 +82,13 @@
  					/^Class:/  { if (req_class == $2) { found=1 } }
 Index: geninitrd
 ===================================================================
---- geninitrd	(wersja 12408)
+--- geninitrd	(wersja 12380)
 +++ geninitrd	(kopia robocza)
 @@ -18,6 +18,7 @@
  # list of geninitrd modules which need setup routine after commandline args parsing
  GENINITRD_MODS=""
  COMPRESS=yes
-+STRIP=yes
++STRIP=strip
  target=""
  kernel=""
  force=""
@@ -96,26 +96,34 @@
  	echo "Usage: $PROGRAM [--version] [-v] [-f] [--ifneeded] [--preload <module>]"
  	echo "       [--with=<module>] [--image-version] [--fstab=<fstab>] [--nocompress]"
  	echo "       [--compress=yes|xz|lzma|bzip2|gzip|lzo]"
-+	echo "       [--nostrip ]"
++	echo "       [--nostrip ] [--strip PATH/strip] [--strip=PATH/strip]"
  	echo "       [--initrdfs=rom|initramfs|ext2|cram] [--modules-conf=<modules.conf>]"
  	echo "       [--with-bootsplash] [--without-bootsplash]"
  	echo "       [--with-fbsplash] [--without-fbsplash]"
-@@ -630,6 +632,9 @@
+@@ -630,6 +632,10 @@
  		inst_d "/lib/modules/$kernel/$MODULEDIR"
  		cp -a "/lib/modules/$kernel/$mod" "$DESTDIR/lib/modules/$kernel/$mod"
  		gunzip "$DESTDIR/lib/modules/$kernel/$mod" 2> /dev/null
-+		if [ -x /usr/bin/strip ] && is_yes "$STRIP"; then
-+			/usr/bin/strip --strip-unneeded --remove-section=.comment --remove-section=.note.GNU-stack "$DESTDIR/lib/modules/$kernel/$mod"
++		if [ "$STRIP" ] ; then
++			mod_nocomp=${mod%.gz}
++			$STRIP --strip-unneeded --remove-section=.comment --remove-section=.note.GNU-stack "$DESTDIR/lib/modules/$kernel/$mod_nocomp"
 +		fi
  	done
  }
  
-@@ -1017,6 +1022,9 @@
+@@ -1017,6 +1023,16 @@
  	--nocompress)
  		COMPRESS=no
  		;;
 +	--nostrip)
-+		STRIP=no
++		STRIP=
++		;;
++	--strip=*)
++		STRIP="${1#--strip=}"
++		;;
++	--strip)
++		STRIP=$2
++		shift
 +		;;
  	--ifneeded)
  		ifneeded=1

================================================================
Index: packages/geninitrd/geninitrd.spec
diff -u packages/geninitrd/geninitrd.spec:2.190 packages/geninitrd/geninitrd.spec:2.191
--- packages/geninitrd/geninitrd.spec:2.190	Tue Nov  8 22:10:09 2011
+++ packages/geninitrd/geninitrd.spec	Wed Nov  9 19:21:23 2011
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:		geninitrd
 Version:	12385
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
@@ -125,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 2.191  2011/11/09 18:21:23  arekm
+- rel 4; fix strip to work also with compressed modules
+
 Revision 2.190  2011/11/08 21:10:09  arekm
 - rel 3; modules stripping support
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd-svn.patch?r1=2.10&r2=2.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd.spec?r1=2.190&r2=2.191&f=u



More information about the pld-cvs-commit mailing list