X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=makedist;h=e4f20acf8674c07647559b526fd6442a17c8da3e;hb=47c4331d1fe9c68e9d8dd0a7d94ee8e70b285a0b;hp=03ec5fc9721c61e8b5f0daad90a6c3edd6c0ac01;hpb=8320878543bb5e49b5acb24fa919ff11be485c61;p=thirdparty%2Fmdadm.git

diff --git a/makedist b/makedist
index 03ec5fc9..e4f20acf 100755
--- a/makedist
+++ b/makedist
@@ -1,4 +1,6 @@
 #!/bin/sh
+# avoid silly sorting
+export LANG=C
 arg=$1
 target=~/public_html/source/mdadm
 if [ " $arg" = " test" ]
@@ -12,11 +14,11 @@ then :
 else echo $target is not a directory
      exit 2
 fi
-set `grep '^char Version' ReadMe.c `
-version=`echo $7 | sed 's/v//'`
-grep "^.TH MDADM 8 .. v$version" mdadm.8 > /dev/null 2>&1 ||
+set `grep '^#define VERSION' ReadMe.c `
+version=`echo $3 | sed -e 's/"//g'`
+grep "^.TH MDADM 8 .. v$version" mdadm.8.in > /dev/null 2>&1 ||
  {
-   echo mdadm.8 does not mention version $version.
+   echo mdadm.8.in does not mention version $version.
    exit 1
  }
 grep "^.TH MDMON 8 .. v$version" mdmon.8 > /dev/null 2>&1 ||
@@ -42,16 +44,16 @@ else { cat inventory ; echo ANNOUNCE-$version ; } | sort -o inventory
 fi
 
 echo version = $version
-base=mdadm-$version.tgz
+base=mdadm-$version.tar.gz
 if [ " $arg" != " diff" ]
 then
-  if [ -f $target/$base ] 
-  then 
+  if [ -f $target/$base ]
+  then
     echo $target/$base exists.
     exit 1
   fi
   trap "rm $target/$base; exit" 1 2 3
-  ( cd .. ; ln -s mdadm.v2 mdadm-$version ; tar chvf - --exclude=.git --exclude="TAGS" --exclude='*~' --exclude=.patches --exclude='*,v' --exclude='*.o' --exclude mdadm --exclude=mdadm'.[^ch0-9]' --exclude=RCS mdadm-$version ; rm mdadm-$version ) | gzip --best > $target/$base
+  git archive --prefix=mdadm-$version/ HEAD | gzip --best > $target/$base
   chmod a+r $target/$base
   ls -l $target/$base
   if tar tzf $target/$base | sed 's,[^/]*/,,' | sort | diff -u inventory -
@@ -67,18 +69,28 @@ then
   cp ChangeLog $target/ChangeLog
   if [ " $arg" != " test" ]
   then
-    scp $target/$base master.kernel.org:/pub/linux/utils/raid/mdadm/mdadm-$version.tar.gz
-    scp $target/ANNOUNCE $target/ChangeLog master.kernel.org:/pub/linux/utils/raid/mdadm/
+    echo -n "Confirm signing this release? "
+    read a
+    if [ " $a" != " y" ]; then echo OK - bye. ; exit 1; fi
+    if zcat $target/$base | gpg -ba > $target/$base.sign && gpg -ba $target/ANNOUNCE
+    then
+      kup put $target/$base  $target/$base.sign \
+	  /pub/linux/utils/raid/mdadm/mdadm-$version.tar.gz
+      kup put $target/ANNOUNCE $target/ANNOUNCE.asc /pub/linux/utils/raid/mdadm/ANNOUNCE
+    else
+      echo signing failed
+      exit 1
+    fi
   fi
 else
-  if [ ! -f $target/$base ] 
-  then 
+  if [ ! -f $target/$base ]
+  then
     echo $target/$base does not exist.
     exit 1
   fi
   ( cd .. ; ln -s mdadm.v2 mdadm-$version ; tar chf - --exclude=.git --exclude="TAGS" --exclude='*,v' --exclude='*~' --exclude='*.o' --exclude mdadm --exclude=mdadm'.[^ch0-9]' --exclude=RCS mdadm-$version ; rm mdadm-$version ) | gzip --best > /var/tmp/mdadm-new.tgz
   mkdir /var/tmp/mdadm-old ; zcat $target/$base | ( cd /var/tmp/mdadm-old ; tar xf - )
   mkdir /var/tmp/mdadm-new ; zcat /var/tmp/mdadm-new.tgz | ( cd /var/tmp/mdadm-new ; tar xf - )
-  diff -ru /var/tmp/mdadm-old /var/tmp/mdadm-new 
+  diff -ru /var/tmp/mdadm-old /var/tmp/mdadm-new
   rm -rf /var/tmp/mdadm-old /var/tmp/mdadm-new /var/tmp/mdadm-new.tgz
 fi