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:41:59 -0300 |
| commit | 94f7df8fa03a815bdf0f7784589d9d0a337c73f7 (patch) | |
| tree | 268bfa77ac00f72c74129ea35310cc85bedc0425 | |
| parent | 6ebd280c9f655225d918a2eb0d3d70d987165429 (diff) | |
| download | pfsense-94f7df8fa03a815bdf0f7784589d9d0a337c73f7.zip pfsense-94f7df8fa03a815bdf0f7784589d9d0a337c73f7.tar.gz | |
Add a variable to control if pkg repo should be signed or not
| -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 2f1496b..44b87b2 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1577,8 +1577,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 3a8c2b7..014db8c 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -311,6 +311,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}" |
