From c138dd08bbfb5f2d08c139962468ff1f70d353e0 Mon Sep 17 00:00:00 2001 From: Steve Varnau Date: Tue, 15 May 2018 17:20:55 +0000 Subject: [PATCH 1/2] Add RH7 supported flag to build & test on additional OS --- core/sqf/conf/install_features | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/sqf/conf/install_features b/core/sqf/conf/install_features index bef95dab8a..535f4fac32 100644 --- a/core/sqf/conf/install_features +++ b/core/sqf/conf/install_features @@ -69,3 +69,5 @@ export CDH_5_7_SUPPORT="Y" export APACHE_1_0_X_SUPPORT="Y" export APACHE_1_1_X_SUPPORT="Y" export APACHE_1_2_X_SUPPORT="Y" + +export REDHAT_7_SUPPORT="Y" From f3d6dd6b1cee32e1a488cbd45ce9325c84752665 Mon Sep 17 00:00:00 2001 From: Steve Varnau Date: Thu, 17 May 2018 22:11:21 +0000 Subject: [PATCH 2/2] Fix branch name for newer git with detached HEAD Invalid branch name leaves unbalanced paren in version code. --- core/sqf/build-scripts/build.branch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/sqf/build-scripts/build.branch b/core/sqf/build-scripts/build.branch index 4b508cc16a..001e60ac72 100755 --- a/core/sqf/build-scripts/build.branch +++ b/core/sqf/build-scripts/build.branch @@ -47,7 +47,7 @@ if [[ "$USE_GIT" == "1" ]];then # runs make with a detached HEAD then change the space in "(no branch)" # to an underscore so it can be used. if [ -z "$ZUUL_BRANCH" ]; then - branch=$(git branch --no-color| grep '^\* ' | sed 's/(no branch)/no_branch/' | awk '{print $2}') + branch=$(git branch --no-color| grep '^\* ' | sed -e 's/(no branch)/no_branch/' -e 's/(detached .*)/no_branch/' | awk '{print $2}') else branch=$ZUUL_BRANCH; fi