diff options
| author | Renato Botelho <renato@netgate.com> | 2016-05-12 17:20:40 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-05-12 17:20:53 -0300 |
| commit | ac4645244f2ee3f4341e48f8eb4bb75217ec5775 (patch) | |
| tree | c0c94eef6d349068350b9ec230027403d7375d61 /tools/builder_defaults.sh | |
| parent | da249a00a3015c17f995e65a9830a7142b9f7356 (diff) | |
| download | pfsense-ac4645244f2ee3f4341e48f8eb4bb75217ec5775.zip pfsense-ac4645244f2ee3f4341e48f8eb4bb75217ec5775.tar.gz | |
Adjust build code to run with poudriere-devel, what have support to build jail from git and remove workaround used in the past to make it possible to build from svn applying patches
Diffstat (limited to 'tools/builder_defaults.sh')
| -rw-r--r-- | tools/builder_defaults.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 41a2698..3b256c7 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -143,7 +143,6 @@ GIT_REPO_BASE=$(git -C ${BUILDER_ROOT} config --get remote.origin.url | sed -e ' # This is used for using svn for retrieving src export FREEBSD_REPO_BASE=${FREEBSD_REPO_BASE:-"${GIT_REPO_BASE}/freebsd-src.git"} export FREEBSD_BRANCH=${FREEBSD_BRANCH:-"devel"} -export FREEBSD_PARENT_BRANCH=${FREEBSD_PARENT_BRANCH:-"stable/10"} export FREEBSD_SRC_DIR=${FREEBSD_SRC_DIR:-"${SCRATCHDIR}/FreeBSD-src"} if [ "${TARGET}" = "i386" ]; then @@ -152,6 +151,16 @@ else export BUILD_KERNELS=${BUILD_KERNELS:-"${PRODUCT_NAME}"} fi +# XXX: Poudriere doesn't like ssh short form +case "${FREEBSD_REPO_BASE}" in + git@*) + export FREEBSD_REPO_BASE_POUDRIERE="ssh://$(echo ${FREEBSD_REPO_BASE} | sed 's,:,/,')" + ;; + *) + export FREEBSD_REPO_BASE_POUDRIERE="${FREEBSD_REPO_BASE}" + ;; +esac + # Leave this alone. export SRC_CONF=${SRC_CONF:-"${FREEBSD_SRC_DIR}/release/conf/${PRODUCT_NAME}_src.conf"} export MAKE_CONF=${MAKE_CONF:-"${FREEBSD_SRC_DIR}/release/conf/${PRODUCT_NAME}_make.conf"} @@ -272,6 +281,13 @@ export POUDRIERE_BULK=${POUDRIERE_BULK:-"${BUILDER_TOOLS}/conf/pfPorts/poudriere export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/freebsd-ports.git"} export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"devel"} +# XXX: Poudriere doesn't like ssh short form +case "${POUDRIERE_PORTS_GIT_URL}" in + git@*) + POUDRIERE_PORTS_GIT_URL="ssh://$(echo ${POUDRIERE_PORTS_GIT_URL} | sed 's,:,/,')" + ;; +esac + # Host to rsync pkg repos from poudriere export PKG_RSYNC_HOSTNAME=${PKG_RSYNC_HOSTNAME:-${STAGING_HOSTNAME}} export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"} |
