Various fixes to the deb_dpkg build script

* Use more accurate means of finding upstream original version
* Remove options from dpkg-checkbuilddeps
* Replace ~ with - in origin versions
* Add message indicating which packages need to be included in respin
* refactor checks for shasums of respin scripts

Change-Id: Ie6f95f71cd37434882a93c3ad25d8444460ec74d
Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>

diff --git a/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh b/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh
index e81267a..12c479f 100644 (file)
--- a/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh
+++ b/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh
@@ -1,34 +1,40 @@
 #!/bin/bash
-# basic build script example
+
 set -e -o pipefail
-# do nothing but print the current slave hostname
-hostname
 
-echo "cat /etc/bootstrap.sha"
-if [ -f /etc/bootstrap.sha ];then
-    cat /etc/bootstrap.sha
-else
-    echo "Cannot find /etc/bootstrap.sha"
-fi
+# print the current slave hostname
+hostname
 
-echo "cat /etc/bootstrap-functions.sha"
-if [ -f /etc/bootstrap-functions.sha ];then
-    cat /etc/bootstrap-functions.sha
-else
-    echo "Cannot find /etc/bootstrap-functions.sha"
+for hashfile in bootstrap.sha bootstrap-functions.sha
+do
+    echo -n "${hashfile}: "
+    if [ -f /etc/${hashfile} ];then
+        cat /etc/${hashfile}
+    else
+        echo "Cannot find ${hashfile}"
+    fi
+done
+
+echo "sha1sum of script [${0}]: " $(sha1sum $0)
+
+MISSING_PKGS=$(dpkg-checkbuilddeps |& perl -pe 's/^.+://g; s/\(.*?\)//g; s/\|\s+\S+//g;')
+MISSING_PKGS="devscripts pristine-tar ${MISSING_PKGS}"
+
+if [ -n "${MISSING_PKGS}" ]
+then
+    echo "*******************************************************************"
+    echo "* ADD MISSING DEPENDENCIES TO RESPIN SCRIPT:"
+    echo "${MISSING_PKGS}"
+    echo "*******************************************************************"
 fi
 
-echo "sha1sum of this script: ${0}"
-sha1sum $0
-
-MISSING_PKGS=$(dpkg-checkbuilddeps |& perl -pe 's/^.+://g; s/\(.*?\)//g')
-
 sudo apt-get update
-sudo apt-get install -y ${MISSING_PKGS} devscripts pristine-tar
+sudo apt-get install -y ${MISSING_PKGS}
 
 pkg_version=$(dpkg-parsechangelog --show-field Version)
-orig_version=$(echo ${pkg_version} | sed s'/-.*//')
-orig_tarball="dpdk_${orig_version}.orig.tar.gz"
+orig_version=$(echo ${pkg_version} | perl -pe 's/-.+$//; s/~/-/') # remove debian suffix, replace ~rc1 with -rc1, for instance
+orig_tarball=$(git ls-tree remotes/origin/pristine-tar | perl -ne "print /(dpdk_${orig_version}.orig.+).id/")
+
 pristine-tar checkout ${orig_tarball}
 mv ${orig_tarball} ..