From 81b0d12dfeb593e367c1206d6670401d8bae9b49 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Thu, 20 Jul 2017 17:48:54 +0900 Subject: [PATCH] dist/debian: use correct variable to detect distribution version Since we switched to pbuilder and supported cross build, we no longer able to use $DISTRIBUTION and $RELEASE in the script. Use $TARGET instead. Signed-off-by: Takuya ASADA Message-Id: <1500540534-27951-1-git-send-email-syuu@scylladb.com> --- dist/debian/build_deb.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh index edc7268..73c5ea2 100755 --- a/dist/debian/build_deb.sh +++ b/dist/debian/build_deb.sh @@ -100,12 +100,12 @@ cp dist/debian/rules.in debian/rules sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" debian/changelog sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" debian/changelog sed -i -e "s/@@CODENAME@@/$TARGET/g" debian/changelog -if [ "$DISTRIBUTION" = "Ubuntu" ]; then +if [ "$TARGET" = "trusty" ] || [ "$TARGET" = "xenial" ] || [ "$TARGET" = "yakkety" ] || [ "$TARGET" = "zesty" ] || [ "$TARGET" = "artful" ]; then sed -i -e "s/@@REVISION@@/0ubuntu1/g" debian/changelog else sed -i -e "s/@@REVISION@@/1/g" debian/changelog fi -if [ "$RELEASE" = "14.04" ]; then +if [ "$TARGET" = "trusty" ]; then sed -i -e "s/@@DH_INSTALLINIT@@/--upstart-only/g" debian/rules else sed -i -e "s/@@DH_INSTALLINIT@@//g" debian/rules