Move calls to SET_ARRAY_INFO to common helper.

[thirdparty/mdadm.git] / makedist

diff --git a/makedist b/makedist
index c60148ab26161104c36acf88ded6ecee4e246731..7adbd7f2cdcae491c9795f654fb90098cc690f92 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -1,6 +1,12 @@
 #!/bin/sh
 arg=$1
 target=~/public_html/source/mdadm
+if [ " $arg" = " test" ]
+then
+  target=/tmp/mdadm-test
+  rm -rf $target
+  mkdir -p $target
+fi
 if [ -d $target ]
 then :
 else echo $target is not a directory
@@ -13,7 +19,8 @@ grep "^.TH MDADM 8 .. v$version" mdadm.8 > /dev/null 2>&1 ||
    echo mdadm.8 does not mention verion $version.
    exit 1
  }
-grep "^Version: *$version$" mdadm.spec > /dev/null 2>&1 || 
+rpmv=`echo $version | tr - _`
+grep "^Version: *$rpmv$" mdadm.spec > /dev/null 2>&1 ||
  {
    echo mdadm.spec does not mention version $version.
    exit 1
@@ -39,30 +46,32 @@ then
     exit 1
   fi
   trap "rm $target/$base; exit" 1 2 3
-  ( cd .. ; ln -s mdadm mdadm-$version ; tar chvf - --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
+  ( 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
   chmod a+r $target/$base
   ls -l $target/$base
   if tar tzf $target/$base | sed 's,[^/]*/,,' | sort | diff -u inventory -
   then : correct files found
-  else echo "Extra files, or invertory is out-of-date"
+  else echo "Extra files, or inventory is out-of-date"
        rm $target/$base
        exit 1
   fi
-
-  rpm -ta $target/$base
+  rpmbuild -ta $target/$base || exit 1
   find /home/neilb/src/RPM -name "*mdadm-$version-*" \
      -exec cp {} $target/RPM \;
   cp ANNOUNCE-$version $target/ANNOUNCE
   cp ChangeLog $target/ChangeLog
-  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/
+  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/
+  fi
 else
   if [ ! -f $target/$base ] 
   then 
     echo $target/$base does not exist.
     exit 1
   fi
-  ( cd .. ; ln -s mdadm mdadm-$version ; tar chf - --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
+  ( 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