for beta and dev channels, move the diff pointer

diff --git a/get-source.sh b/get-source.sh
index 15f8cfd61e89282eaa3e017ea1b149f86556dedc..5fa6fe9dd2c8f502e2ceb84d169217434af5f851 100755 (executable)
--- a/get-source.sh
+++ b/get-source.sh
@@ -92,7 +92,7 @@ cd ../..
 
 tarball=$PACKAGE_NAME-$VERSION.tar.$EXT
 # xz -9 OOM's on carme
-XZ_OPT=-e8 tar -cf $tarball --$EXT $PACKAGE_NAME-$VERSION
+XZ_OPT=-e8 tar -caf $tarball $PACKAGE_NAME-$VERSION
 ls -lh $tarball
 
 rm -rf $PACKAGE_NAME-$VERSION
@@ -114,6 +114,10 @@ if [ -e $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT ]; then
        current=$DIST_DIR/$PACKAGE_NAME-$VERSION.tar.$EXT
        sh -x $WORK_DIR/make-diff-patch.sh $base $current
        mv $PACKAGE_NAME-$VERSION.patch.xz $DIST_DIR
+       # for beta and dev channels, move the diff pointer
+       if [ "$CHANNEL" != "stable" ]; then
+               ln -sf $PACKAGE_NAME-$VERSION.tar.$EXT $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT
+       fi
 fi
 
 # try updating spec and build it as well

diff --git a/make-diff-patch.sh b/make-diff-patch.sh
index 7d602e75d20b5cb2bb4b0428c78e9ea5685fd8e4..b85878ade58c5eacbf6dd7116bb65649704d0899 100755 (executable)
--- a/make-diff-patch.sh
+++ b/make-diff-patch.sh
@@ -37,6 +37,7 @@ else
        ls -lh $patch
        diffstat $patch | tee $patch.diff
        cat $patch.diff $patch | xz -9 > $patch.xz
+       rm $patch.diff $patch
 fi
 
 rm -rf $dstdir $srcdir