trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject git commit: Move and fix the hardening env variable
Date Wed, 07 May 2014 00:05:46 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 79068efb9 -> 91c80ec58


Move and fix the hardening env variable


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/91c80ec5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/91c80ec5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/91c80ec5

Branch: refs/heads/master
Commit: 91c80ec580ae1efbe231721393cc86c3a83f6a20
Parents: 79068ef
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Tue May 6 18:05:19 2014 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Tue May 6 18:05:19 2014 -0600

----------------------------------------------------------------------
 ci/jenkins/bin/build.sh       | 3 ---
 ci/jenkins/bin/environment.sh | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/91c80ec5/ci/jenkins/bin/build.sh
----------------------------------------------------------------------
diff --git a/ci/jenkins/bin/build.sh b/ci/jenkins/bin/build.sh
index 2246661..220462f 100755
--- a/ci/jenkins/bin/build.sh
+++ b/ci/jenkins/bin/build.sh
@@ -20,9 +20,6 @@
 enable_debug=""
 test "${JOB_NAME#*type=debug}" != "${JOB_NAME}" && enable_debug="--enable-debug"
 
-# Check if we're doing Debian style hardening
-test "${JOB_NAME#*type=hardening}" != "${JOB_NAME}" && export DEB_BUILD_HARDENING
-
 # When to turn on ccache, disabled for all clang / llvm builds
 enable_ccache="--enable-ccache"
 test "${JOB_NAME#*compiler=clang}" != "${JOB_NAME}" && enable_ccache=""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/91c80ec5/ci/jenkins/bin/environment.sh
----------------------------------------------------------------------
diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh
index 5ff2cc5..2136e01 100755
--- a/ci/jenkins/bin/environment.sh
+++ b/ci/jenkins/bin/environment.sh
@@ -19,6 +19,9 @@
 # Shouldn't have to tweak this
 export ATS_SRC_HOME="/home/jenkins/src"
 
+# Check if we're doing Debian style hardening
+test "${JOB_NAME#*type=hardening}" != "${JOB_NAME}" && export DEB_BUILD_HARDENING=1
+
 # Check if we need to use a different "make"
 ATS_MAKE=make
 test "${JOB_NAME#freebsd*}" != "${JOB_NAME}" && ATS_MAKE="gmake"


Mime
View raw message