commit inst-source-utils for openSUSE:Factory

26 Feb 2009

Hello community,

here is the log from the commit of package inst-source-utils for openSUSE:Factory
checked in at Thu Feb 26 03:28:28 CET 2009.


--------

--- inst-source-utils/inst-source-utils.changes	2009-01-23 16:24:40.000000000 +0100
+++ inst-source-utils/inst-source-utils.changes	2009-02-25 11:11:58.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Feb 25 11:10:27 CET 2009 - lrupp@suse.de
+
+- create_package_descr: more help text for the -T XTAGS_FILE 
+- create_sha1sum, create_md5sums - fix bnc#460894: handle multiple
+  arguments
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ inst-source-utils.spec ++++++
--- /var/tmp/diff_new_pack.j26363/_old	2009-02-26 03:09:55.000000000 +0100
+++ /var/tmp/diff_new_pack.j26363/_new	2009-02-26 03:09:55.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package inst-source-utils (Version 2009.1.25)
+# spec file for package inst-source-utils (Version 2009.2.26)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 Name:           inst-source-utils
 Summary:        Utilities for creating customized installation sources
-Version:        2009.1.25
+Version:        2009.2.26
 Release:        1
 Url:            http://en.opensuse.org/Inst-source-utils
 License:        GPL v2 or later
@@ -61,6 +61,10 @@
 %_datadir/%name
 
 %changelog
+* Wed Feb 25 2009 lrupp@suse.de
+- create_package_descr: more help text for the -T XTAGS_FILE
+- create_sha1sum, create_md5sums - fix bnc#460894: handle multiple
+  arguments
 * Fri Jan 23 2009 jcborn@suse.de
 - added gen-s390-cd-kernel.pl because it is required to create
   bootable S/390 media with kiwi-isntsource

++++++ inst-source-utils.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/create_md5sums new/inst-source-utils/usr/bin/create_md5sums
--- old/inst-source-utils/usr/bin/create_md5sums	2009-01-25 01:16:46.000000000 +0100
+++ new/inst-source-utils/usr/bin/create_md5sums	2009-02-26 03:09:51.000000000 +0100
@@ -20,13 +20,14 @@
 # Boston, MA  02110-1301,
 # USA.
 #
-# $Id: create_md5sums,v 1.9 2009/01/21 14:44:26 lrupp Exp lrupp $
+# $Id: create_md5sums,v 1.11 2009/01/27 14:13:14 lrupp Exp lrupp $
 #
 
 function usage (){
     echo
     echo "Usage: `basename $0` [--meta] <targetdir>"
     echo "       --meta : also create MD5SUMS.meta file"
+    echo "       --quiet: don't output anything"
     echo 
     echo "       Creates MD5SUMS files in each subdirectory."
     echo "       Sometimes useful for debugging inst-source problems ;-)"
@@ -34,6 +35,12 @@
     exit $1
 }
 
+function output(){
+    if [ "$QUIET" != "yes" ]; then
+        echo "$1"
+    fi
+}
+
 if [ -z "$1" ]; then
   usage 1;
 fi
@@ -47,18 +54,22 @@
 umask 022
 
 CREATE_META=
+QUIET="no"
+
 if test "x$1" = "x--meta"; then
     CREATE_META=1
     shift
 fi
+if test "x$1" = "x--quiet"; then
+    QUIET="yes"
+    shift
+fi
 
 ROOTDIRS="$*"
 TMPFILE=$(mktemp /tmp/.create_md5sums.XXXXXX)
 MYPWD=$(pwd)
 
-test -z "$ROOTDIRS" && ROOTDIRS="$MYPWD"
-
-for ROOTDIR in "$ROOTDIRS" ; do
+for ROOTDIR in "$@" ; do
     case "$ROOTDIR" in
 	/*) ;;
 	*) ROOTDIR="$MYPWD/$ROOTDIR" ;;
@@ -68,53 +79,58 @@
         echo "WARNING: $ROOTDIR is not a directory.  Skipping it."
     }
 
-    for DIR in $(find "$ROOTDIR" -type d) ; do
+    find "$ROOTDIR" -type d | while read DIR; do
         cd "$DIR"
-        FILES=$(
-          for FILE in * ; do
+        unset FILES
+        NFILES=0
+        for FILE in * ; do
             test -f "$FILE" || continue
             test -L "$FILE" && continue
             test -n "$MD5SUMS_SKIPFILES" && {
                 IS_SKIP=false
-		        set -f
+                set -f
                 for i in $MD5SUMS_SKIPFILES ; do
-		          set +f
-		          case "$FILE" in
-			        ($i) IS_SKIP=true
-			        break
-			        ;;
-		          esac
+                    set +f
+                    case "$FILE" in
+                      ($i)
+                        IS_SKIP=true
+                        break
+                        ;;
+                    esac
                 done
-		        set +f
+                set +f
                 test $IS_SKIP = true && continue
             }
             case "$FILE" in
-              (*.swp|MD5SUMS*)
+              (*.swp|MD5SUMS*|SHA1SUMS*)
                 continue
                 ;;
               (*)
-                echo $FILE
+                FILES[$[++NFILES]]="$FILE"
                 ;;
             esac
-          done)
-        if test -z "$FILES" ; then
+          done
+        if [ $NFILES -eq 0 ]; then
             rm -f MD5SUMS*
         else
-	        echo "$FILES" | xargs md5sum > $TMPFILE
+            echo -n > $TMPFILE
+            for FILE in "${FILES[@]}"; do
+                md5sum "$FILE" >> $TMPFILE;
+            done
             test -e MD5SUMS || touch MD5SUMS
 	        cmp -s $TMPFILE MD5SUMS || {
                 mv $TMPFILE MD5SUMS
 				chmod 644 MD5SUMS
-                echo "Info:   created MD5SUMS in $DIR"
+                output "INFO:   created MD5SUMS in $DIR"
 	        }
 	    if test -n "$CREATE_META"; then
-		test -e MD5SUMS.meta || touch MD5SUMS.meta
-		md5sum MD5SUMS > $TMPFILE
-		cmp -s $TMPFILE MD5SUMS.meta || {
-		    mv $TMPFILE MD5SUMS.meta
-			chmod 644 MD5SUMS.meta
-		    echo "Info:   created MD5SUMS.meta in $DIR"
-		}
+            test -e MD5SUMS.meta || touch MD5SUMS.meta
+            md5sum MD5SUMS > $TMPFILE
+            cmp -s $TMPFILE MD5SUMS.meta || {
+		        mv $TMPFILE MD5SUMS.meta
+                chmod 644 MD5SUMS.meta
+                output "INFO:   created MD5SUMS.meta in $DIR"
+            }
 	    fi
             rm -f $TMPFILE
         fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/create_package_descr new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr	2009-01-25 01:16:46.000000000 +0100
+++ new/inst-source-utils/usr/bin/create_package_descr	2009-02-26 03:09:51.000000000 +0100
@@ -73,7 +73,7 @@
     print "       [-o OUTPUT_DIR ]              (default `cwd`/setup/descr)\n";
     print "       [-c CACHE_DIR ]               (default none)\n";
     print "       [-M MAXDEPTH ]                (default $maxdepth, depth for du-file)\n";
-    print "       [-T XTAGS_FILE ]              (extra hacks)\n";
+    print "       [-T XTAGS_FILE ]              (extra tags for the packages file)\n";
     print "       [-Z ]                         (add_licenses)\n";
     print "       [-V ]                         (add_vendor for each rpm)\n";
     print "       [-S ]                         (ignore_sources)\n";
@@ -82,7 +82,13 @@
     print "       [-C ]                         (do_checksums)\n";
     print "       [-K ]                         (do_keywords)\n";
     print "       [-F ]                         (do_file_list)\n";
-    print "       [-B ]                         (add requires for src packages)\n";
+    print "       [-B ]                         (add requires for src packages)\n\n";
+	print "       Note: the -T option allows to add additional tags to the\n";
+	print "             resulting packages file.\n";
+	print "             The file should contain the package name, a colon and\n";
+	print "             a whitespace. Afterwards, additional tags in one line\n";
+	print "             (newlines can be produced via \\n).\n";
+	print "             Example: 3ddiag: +Kwd:\\nsupport_l3\\n-Kwd:\n";
     exit $exit_code;
 }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/create_sha1sum new/inst-source-utils/usr/bin/create_sha1sum
--- old/inst-source-utils/usr/bin/create_sha1sum	2009-01-25 01:16:46.000000000 +0100
+++ new/inst-source-utils/usr/bin/create_sha1sum	2009-02-26 03:09:51.000000000 +0100
@@ -20,7 +20,7 @@
 # Boston, MA  02110-1301,
 # USA.
 #
-# $Id: create_sha1um,v 1.8 2008/06/25 12:18:19 lrupp Exp lrupp $
+# $Id: create_sha1sum,v 1.1 2009/01/27 14:12:50 lrupp Exp lrupp $
 #
 
 function usage (){
@@ -65,13 +65,10 @@
 	shift
 fi
 
-ROOTDIRS="$*"
 TMPFILE=$(mktemp /tmp/.create_sha1sums.XXXXXX)
 MYPWD=$(pwd)
 
-test -z "$ROOTDIRS" && ROOTDIRS="$MYPWD"
-
-for ROOTDIR in "$ROOTDIRS" ; do
+for ROOTDIR in "$@" ; do
     case "$ROOTDIR" in
 	/*) ;;
 	*) ROOTDIR="$MYPWD/$ROOTDIR" ;;
@@ -81,10 +78,11 @@
         echo "WARNING: $ROOTDIR is not a directory.  Skipping it." >&2
     }
 
-    for DIR in $(find "$ROOTDIR" -type d) ; do
+    find "$ROOTDIR" -type d | while read DIR; do
         cd "$DIR"
-        FILES=$(
-          for FILE in * ; do
+        unset FILES
+        NFILES=0
+        for FILE in * ; do
             test -f "$FILE" || continue
             test -L "$FILE" && continue
             test -n "$SHA1SUM_SKIPFILES" && {
@@ -102,32 +100,35 @@
                 test $IS_SKIP = true && continue
             }
             case "$FILE" in
-              (*.swp|SHA1SUMS*)
+              (*.swp|SHA1SUMS*|MD5SUMS*)
                 continue
                 ;;
               (*)
-                echo $FILE
+                FILES[$[++NFILES]]="$FILE"
                 ;;
             esac
-          done)
-        if test -z "$FILES" ; then
+          done
+        if [ $NFILES -eq 0 ]; then
             rm -f SHA1SUMS*
         else
-	        echo "$FILES" | xargs sha1sum > $TMPFILE
+            echo -n > $TMPFILE
+            for FILE in "${FILES[@]}"; do
+	            sha1sum "$FILE" >> $TMPFILE
+            done
             test -e SHA1SUMS || touch SHA1SUMS
 	        cmp -s $TMPFILE SHA1SUMS || {
                 mv $TMPFILE SHA1SUMS
 				chmod 644 SHA1SUMS
-                output "Info:   created SHA1SUMS in $DIR"
+                output "INFO:   created SHA1SUMS in $DIR"
 	        }
-	    if test -n "$CREATE_META"; then
-		test -e SHA1SUMS.meta || touch SHA1SUMS.meta
-		sha1sum SHA1SUMS > $TMPFILE
-		cmp -s $TMPFILE SHA1SUMS.meta || {
-		    mv $TMPFILE SHA1SUMS.meta
-			chmod 644 SHA1SUMS.meta
-		    output "Info:   created SHA1SUMS.meta in $DIR"
-		}
+        if test -n "$CREATE_META"; then
+            test -e SHA1SUMS.meta || touch SHA1SUMS.meta
+            sha1sum SHA1SUMS > $TMPFILE
+            cmp -s $TMPFILE SHA1SUMS.meta || {
+		        mv $TMPFILE SHA1SUMS.meta
+                chmod 644 SHA1SUMS.meta
+                output "INFO:   created SHA1SUMS.meta in $DIR"
+            }
 	    fi
             rm -f $TMPFILE
         fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/create_sha1sums new/inst-source-utils/usr/bin/create_sha1sums
--- old/inst-source-utils/usr/bin/create_sha1sums	2009-01-25 01:16:46.000000000 +0100
+++ new/inst-source-utils/usr/bin/create_sha1sums	2009-02-26 03:09:51.000000000 +0100
@@ -19,7 +19,7 @@
 # Boston, MA  02110-1301,
 # USA.
 #
-# $Id: create_sha1sums,v 1.6 2008/11/10 21:41:56 lrupp Exp lrupp $
+# $Id: create_sha1sums 104 2009-02-19 14:21:03Z lrupp $
 #
 
 SIGN="yes"
@@ -73,7 +73,7 @@
 fi
 
 # prepare content file
-CONTTMP=`mktemp $CDS_PRIM/content-XXXXXX`
+CONTTMP=$(mktemp $CDS_PRIM/content-XXXXXX)
 grep -v "^META " $CDS_PRIM/content | grep -v "^KEY " | grep -v "^HASH SHA1" > $CONTTMP
 mv $CONTTMP $CDS_PRIM/content
 
@@ -90,7 +90,7 @@
 fi
 pushd $CDS_PRIM >/dev/null
 if [ "$EXTRA" = "yes" ] ; then
-    for i in license.tar.gz control.xml installation.xml media.1/info.txt ; do
+    for i in license.tar.gz control.xml installation.xml media.1/info.txt media.1/license.zip ; do
         test -f $i || continue
         sha1sum $i 2>/dev/null | sed -e "s@^@HASH SHA1 @" >> $CDS_PRIM/content
     done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/gen-s390-cd-kernel.pl new/inst-source-utils/usr/bin/gen-s390-cd-kernel.pl
--- old/inst-source-utils/usr/bin/gen-s390-cd-kernel.pl	2009-01-25 01:16:46.000000000 +0100
+++ new/inst-source-utils/usr/bin/gen-s390-cd-kernel.pl	2009-02-26 03:09:51.000000000 +0100
@@ -22,6 +22,7 @@
 # Boston, MA  02110-1301,
 # USA.
 #
+# $Id: gen-s390-cd-kernel.pl 101 2009-01-28 16:20:37Z lrupp $
 
 use FileHandle;
 use Getopt::Long;
@@ -111,8 +112,8 @@
 # First fill the entire size with zeroes
 sysopen(null_fh,"/dev/zero",O_RDONLY) or die "Cannot open /dev/zero: $!\n";
 
-my $buffer;
-my $blocks_read;
+my $buffer="";
+my $blocks_read=0;
 while ($blocks_read < ($boot_size >> 12)) {
     sysread(null_fh,$buffer, 4096);
     syswrite(out_fh,$buffer);


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)