diff options
author | Renato Botelho <renato@netgate.com> | 2016-08-03 17:41:59 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-08-03 17:42:10 -0300 |
commit | e366c806406daf94e09b8be9918aa6515031c4ab (patch) | |
tree | bb17f9dc50cb9727d57295ce0a5b2779ced4328f /tools | |
parent | b8332debca8d8334fb51ed17638df7343c738e59 (diff) | |
download | pfsense-e366c806406daf94e09b8be9918aa6515031c4ab.zip pfsense-e366c806406daf94e09b8be9918aa6515031c4ab.tar.gz |
Add a variable to control if pkg repo should be signed or not
Diffstat (limited to 'tools')
-rw-r--r-- | tools/builder_common.sh | 3 | ||||
-rw-r--r-- | tools/builder_defaults.sh | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 7c29c49..cadcefc 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1935,8 +1935,7 @@ pkg_repo_rsync() { local _logfile="${LOGFILE}" fi - if [ -n "${PKG_REPO_SIGNING_COMMAND}" ]; then - + if [ -n "${PKG_REPO_SIGNING_COMMAND}" -a -z "${DO_NOT_SIGN_PKG_REPO}" ]; then # Detect poudriere directory structure if [ -L "${_repo_path}/.latest" ]; then local _real_repo_path=$(readlink -f ${_repo_path}/.latest) diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index abac096..bdf3c03 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -341,6 +341,7 @@ else fi # Command used to sign pkg repo export PKG_REPO_SIGNING_COMMAND=${PKG_REPO_SIGNING_COMMAND:-"ssh sign@codesigner.netgate.com sudo ./sign.sh ${PKG_REPO_SIGN_KEY}"} +export DO_NOT_SIGN_PKG_REPO=${DO_NOT_SIGN_PKG_REPO:-} # Define base package version, based on date for snaps export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}${PRODUCT_REVISION:+_}${PRODUCT_REVISION}" |