From b6c6f4c5e351e1008b0e1f8c712eaa519d67f7cd Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 23 Sep 2015 13:25:22 -0400 Subject: [PATCH] remove gpg references when building DEBs Signed-off-by: Alfredo Deza --- ceph-build/build/build_deb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb index e754075e..e5dc63d1 100644 --- a/ceph-build/build/build_deb +++ b/ceph-build/build/build_deb @@ -28,13 +28,10 @@ get_bptag() { BPTAG=`get_bptag $DIST` -export GNUPGHOME=/home/jenkins-build/build/gnupg.ceph-release/ -export KEYID=460F3994 HOST=$(hostname --short) echo "Building on $(hostname) Date: $(date)" echo " DIST=${DIST}" echo " BPTAG=${BPTAG}" -echo " KEYID=${KEYID}" echo " WS=$WORKSPACE" echo " PWD=$(pwd)" echo " BUILD SOURCE=$COPYARTIFACT_BUILD_NUMBER_CEPH_SETUP" @@ -51,6 +48,9 @@ echo "${vers}-1" > release/${vers}/debian_version cd release/$vers + +# HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK +# FIXME: I don't think we need this 'hack' anymore # Dirty Hack: baddist=$(echo $DIST | grep -ic -e squeeze -e wheezy || true) if [ $baddist -eq 1 ] @@ -59,15 +59,23 @@ then sed -i 's/ liblttng-ust-dev//g' ceph_${vers}-1.dsc || true fi +# HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK + # unpack sources dpkg-source -x ceph_${vers}-1.dsc + + +# HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK if [ $baddist -eq 1 ] then rm -vf *.orig.tar.gz || true grep -v babeltrace ceph-${vers}/debian/control | grep -v liblttng > ceph-${vers}/debian/control.new mv -v ceph-${vers}/debian/control.new ceph-${vers}/debian/control fi +# HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK + + ( cd ceph-${vers} DEB_VERSION=$(dpkg-parsechangelog | sed -rne 's,^Version: (.*),\1, p') BP_VERSION=${DEB_VERSION}${BPTAG} -- 2.39.5