From: Luca Boccassi Date: Thu, 9 Nov 2017 20:18:48 +0000 (+0000) Subject: deb_dpdk: do not replace ~rc with -rc in tarball X-Git-Url: https://gerrit.fd.io/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=65d11fed51195247c6b753bc38c42fd88c69042d deb_dpdk: do not replace ~rc with -rc in tarball Using ~ is the right separator for RC versions, as - is used for the debian revision. Fixes generating orig tarball for 17.11~rc3. Change-Id: I55ff419eb3c20f2b23353aef9f1743a9118845fd Signed-off-by: Luca Boccassi --- diff --git a/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh b/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh index 12c479fd3..7281160ec 100644 --- a/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh +++ b/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh @@ -32,7 +32,7 @@ sudo apt-get update sudo apt-get install -y ${MISSING_PKGS} pkg_version=$(dpkg-parsechangelog --show-field Version) -orig_version=$(echo ${pkg_version} | perl -pe 's/-.+$//; s/~/-/') # remove debian suffix, replace ~rc1 with -rc1, for instance +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}