diff options
| author | Renato Botelho <renato@netgate.com> | 2017-04-28 16:41:55 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-04-28 16:41:55 -0300 |
| commit | 1af9fab913af5035d5efc3e494349ab5f7fae4ae (patch) | |
| tree | e35379314336c3025b739d31a5b25b324312aaf1 /tools | |
| parent | d126064dcdf36430a82253dc988084bf01f4102e (diff) | |
| download | pfsense-1af9fab913af5035d5efc3e494349ab5f7fae4ae.zip pfsense-1af9fab913af5035d5efc3e494349ab5f7fae4ae.tar.gz | |
Build and install gnid on /usr/sbin
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 19 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 5 |
2 files changed, 24 insertions, 0 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 58cc241..44c46c0 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -261,6 +261,17 @@ make_world() { # (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR}/tools/tools/ath/athstats ${makeargs} clean all install || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} echo ">>> Building and installing crypto tools and athstats for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} + if [ "${PRODUCT_NAME}" = "pfSense" -a -n "${GNID_REPO_BASE}" ]; then + echo ">>> Building gnid... " | tee -a ${LOGFILE} + (cd ${GNID_SRC_DIR} && make clean gnid) || print_error_pfS + install -o root -g wheel -m 0700 ${GNID_SRC_DIR}/gnid \ + ${STAGE_CHROOT_DIR}/usr/sbin \ + || print_error_pfS + install -o root -g wheel -m 0700 ${GNID_SRC_DIR}/gnid \ + ${INSTALLER_CHROOT_DIR}/usr/sbin \ + || print_error_pfS + fi + unset makeargs } @@ -1035,6 +1046,14 @@ update_freebsd_sources() { grep -C3 -i -E 'error|fatal' echo "Done!" fi + + if [ "${PRODUCT_NAME}" = "pfSense" -a -n "${GNID_REPO_BASE}" ]; then + echo ">>> Obtaining gnid sources..." + ${BUILDER_SCRIPTS}/git_checkout.sh \ + -r ${GNID_REPO_BASE} \ + -d ${GNID_SRC_DIR} \ + -b ${GNID_BRANCH} + fi } pkg_chroot() { diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 3b4bf3b..1a61ec8 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -103,6 +103,11 @@ POUDRIERE_BRANCH=$(echo "${GIT_REPO_BRANCH_OR_TAG}" | sed 's,RELENG_,v,; s,\.,_, GIT_REPO_BASE=$(git -C ${BUILDER_ROOT} config --get remote.origin.url | sed -e 's,/[^/]*$,,') +# gnid +export GNID_REPO_BASE=${GNID_REPO_BASE:-"${GIT_REPO_BASE}/gnid.git"} +export GNID_SRC_BASE=${GNID_SRC_BASE:-"${SCRATCHDIR}/gnid"} +export GNID_BRANCH=${GNID_BRANCH:-"master"} + # 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:-"RELENG_2_4"} |
