From: Kefu Chai Date: Wed, 9 Dec 2020 13:36:46 +0000 (+0800) Subject: scripts/build_utils: do not handle wheezy anymore X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1720%2Fhead;p=ceph-build.git scripts/build_utils: do not handle wheezy anymore wheezy is the only "baddist" which does not have "libbabeltrace-ctf-dev". since we don't build wheezy anymore, let's stop handling wheezy. Signed-off-by: Kefu Chai --- diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index b4f7b049e..314f24978 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -789,28 +789,9 @@ build_debs() { 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 wheezy || true) - if [ $baddist -eq 1 ]; then - sed -i 's/ libbabeltrace-ctf-dev, libbabeltrace-dev,//g' ceph_${vers}-1.dsc || true - 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}