From 9147faed366d9373c0371767ee387e2f90efefa4 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Tue, 20 Jun 2017 05:04:05 +0900 Subject: [PATCH] dist/debian: append 'scylla-jmx' prefix to pbuilder tgz and directories We want to allocate pbuilder chroot image and build directories for each scylla repository to make sure build environment is always clean. So append 'scylla-jmx' prefix for them. Signed-off-by: Takuya ASADA Message-Id: <1497902645-29487-2-git-send-email-syuu@scylladb.com> --- dist/debian/build_deb.sh | 2 +- dist/debian/pbuilderrc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh index ad371e6..edc7268 100755 --- a/dist/debian/build_deb.sh +++ b/dist/debian/build_deb.sh @@ -114,7 +114,7 @@ cp dist/common/systemd/scylla-jmx.service.in debian/scylla-jmx.service sed -i -e "s#@@SYSCONFDIR@@#/etc/default#g" debian/scylla-jmx.service cp ./dist/debian/pbuilderrc ~/.pbuilderrc -sudo rm -fv /var/cache/pbuilder/$TARGET-base.tgz +sudo rm -fv /var/cache/pbuilder/scylla-jmx-$TARGET.tgz sudo -E DIST=$TARGET /usr/sbin/pbuilder clean sudo -E DIST=$TARGET /usr/sbin/pbuilder create sudo -E DIST=$TARGET /usr/sbin/pbuilder update diff --git a/dist/debian/pbuilderrc b/dist/debian/pbuilderrc index 00f6bfa..5f5def2 100644 --- a/dist/debian/pbuilderrc +++ b/dist/debian/pbuilderrc @@ -1,9 +1,9 @@ USENETWORK=yes BUILD_HOME=/tmp -BASETGZ="/var/cache/pbuilder/$DIST-base.tgz" +BASETGZ="/var/cache/pbuilder/scylla-jmx-$DIST.tgz" DISTRIBUTION="$DIST" -BUILDRESULT="/var/cache/pbuilder/$DIST/result/" -APTCACHE="/var/cache/pbuilder/$DIST/aptcache/" +BUILDRESULT="/var/cache/pbuilder/scylla-jmx-$DIST/result/" +APTCACHE="/var/cache/pbuilder/scylla-jmx-$DIST/aptcache/" ALLOWUNTRUSTED=yes if [ "$DIST" = "trusty" ] || [ "$DIST" = "xenial" ]; then