X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fdeb_dpdk%2Finclude-raw-deb_dpdk-build.sh;h=7281160ec6d81e98f438db6fbf91560fcca62558;hb=65d11fed51195247c6b753bc38c42fd88c69042d;hp=965ebcc8ce669e8a5d549459f7d691ab60843279;hpb=7533a51d91b01968a617efc606ed9268fdf9c9c4;p=ci-management.git

diff --git a/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh b/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh
index 965ebcc8c..7281160ec 100644
--- a/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh
+++ b/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh
@@ -1,33 +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 install -y ${MISSING_PKGS} devscripts
+sudo apt-get update
+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/-.+$//') # remove debian suffix
+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} ..