summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJes Sorensen <jsorensen@fb.com>2018-03-22 13:05:57 -0400
committerJes Sorensen <jsorensen@fb.com>2018-03-22 13:06:56 -0400
commit94d7a6c3616f997111e52e17a6a4a371c830ee65 (patch)
tree8c01f559cc5205cd6d2d005288db57313c50dad7
parente397cefe1376a8445247bfdfc35d21c16186e9a0 (diff)
downloadmdadm-94d7a6c3616f997111e52e17a6a4a371c830ee65.tar.gz
makedist: Fix to handle rc releases
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
-rwxr-xr-xmakedist6
1 files changed, 3 insertions, 3 deletions
diff --git a/makedist b/makedist
index e4f20ac..0c4b39e 100755
--- a/makedist
+++ b/makedist
@@ -44,7 +44,7 @@ else { cat inventory ; echo ANNOUNCE-$version ; } | sort -o inventory
fi
echo version = $version
-base=mdadm-$version.tar.gz
+base=mdadm-$rpmv.tar.gz
if [ " $arg" != " diff" ]
then
if [ -f $target/$base ]
@@ -53,7 +53,7 @@ then
exit 1
fi
trap "rm $target/$base; exit" 1 2 3
- git archive --prefix=mdadm-$version/ HEAD | gzip --best > $target/$base
+ git archive --prefix=mdadm-$rpmv/ 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 -
@@ -63,7 +63,7 @@ then
exit 1
fi
rpmbuild -ta $target/$base || exit 1
- find /home/neilb/src/RPM -name "*mdadm-$version-*" \
+ find ~/rpmbuild/RPMS -name "*mdadm-$version-*" \
-exec cp {} $target/RPM \;
cp ANNOUNCE-$version $target/ANNOUNCE
cp ChangeLog $target/ChangeLog