fixes for xen native job

1 files changed, 5 insertions, 2 deletions

diff --git a/jenkins-makesources b/jenkins-makesources
index 4056b30..6907955 100755
--- a/jenkins-makesources
+++ b/jenkins-makesources
@@ -47,8 +47,9 @@ then
     fi
     packaging_commit=`cd $packaging_dir && git log -n1 --pretty=format:%h`
 else
+    rm -f *debian.tar*
     wget $packaging_tar
-    tar taf *debian.tar*
+    tar xaf *debian.tar*
     packaging_commit=""
     packaging_dir=debian/
 
@@ -56,7 +57,7 @@ fi
 
 upstream_commit=`cd $upstream_source && git log -n1 --pretty=format:%h`
 
-git_version=`cd $upstream_source && git describe --match='v*'`
+git_version=`cd $upstream_source && git describe --match='v*'`||git_version=$base_version
 pkg_version=`echo $git_version|sed  -e 's/^v//' -e 's/-rc/~rc/' -e 's/-\([0-9]*\)-/+git\1+/'`
 
 currentdate=`date -R`
@@ -66,6 +67,8 @@ cp -a $upstream_source "${pkg_dir}.orig"
 rm -rf "${pkg_dir}.orig/.git"
 cp -a "${pkg_dir}.orig" "${pkg_dir}"
 cp -a $packaging_dir "${pkg_dir}"
+tar caf ${upstream_source}_${pkg_version}.orig.tar.xz ${pkg_dir}.orig
+
 version=${pkg_version}-${BUILD_NUMBER}linaro+${distribution}
 
 echo "Preparing ${version}"