summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-12-23 14:46:37 -0200
committerRenato Botelho <renato@netgate.com>2015-12-23 14:46:37 -0200
commitefcf5e2adaa75a5781deede96d29e9a8610ad4f9 (patch)
treec4e9bd1633770e90c70a7013542d99d7565355e4 /tools
parent52977f3d368634243f24c7fc93e3164cb6cdec43 (diff)
downloadpfsense-efcf5e2adaa75a5781deede96d29e9a8610ad4f9.zip
pfsense-efcf5e2adaa75a5781deede96d29e9a8610ad4f9.tar.gz
Fix repo sign for poudriere directory infrastructure
Diffstat (limited to 'tools')
-rw-r--r--tools/builder_common.sh15
1 files changed, 14 insertions, 1 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index f367f06..1bfd484 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1707,8 +1707,21 @@ pkg_repo_rsync() {
fi
if [ -n "${PKG_REPO_SIGNING_COMMAND}" ]; then
+
+ # Detect poudriere directory structure
+ if [ -L "${_repo_path}/.latest" ]; then
+ local _real_repo_path=$(readlink -f ${_repo_path}/.latest)
+ else
+ local _real_repo_path=${_repo_path}
+ fi
+
echo -n ">>> Signing repository... " | tee -a ${_logfile}
- if script -aq ${_logfile} pkg repo ${_repo_path} \
+ ############ ATTENTION ##############
+ #
+ # For some reason pkg-repo fail without / in the end of directory name
+ # so removing it will break command
+ #
+ if script -aq ${_logfile} pkg repo ${_real_repo_path}/ \
signing_command: ${PKG_REPO_SIGNING_COMMAND} >/dev/null 2>&1; then
echo "Done!" | tee -a ${_logfile}
else
OpenPOWER on IntegriCloud