summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/builder_common.sh6
-rw-r--r--tools/builder_defaults.sh12
2 files changed, 12 insertions, 6 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 44c46c0..6c89cd1 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -263,7 +263,11 @@ make_world() {
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
+ (\
+ cd ${GNID_SRC_DIR} && \
+ make INCLUDE_DIR=${GNID_INCLUDE_DIR} \
+ LIBCRYPTO_DIR=${GNID_LIBCRYPTO_DIR} clean gnid \
+ ) || print_error_pfS
install -o root -g wheel -m 0700 ${GNID_SRC_DIR}/gnid \
${STAGE_CHROOT_DIR}/usr/sbin \
|| print_error_pfS
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 002ecc1..404bf46 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -103,11 +103,6 @@ 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_DIR=${GNID_SRC_DIR:-"${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"}
@@ -141,6 +136,13 @@ export MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX:-"${SCRATCHDIR}/obj"}
export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"cryptodev i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs if_stf coretemp amdtemp aesni sfxge hwpmc vmm nmdm ix ixv"}
+# gnid
+#export GNID_REPO_BASE=${GNID_REPO_BASE:-"${GIT_REPO_BASE}/gnid.git"}
+export GNID_SRC_DIR=${GNID_SRC_DIR:-"${SCRATCHDIR}/gnid"}
+export GNID_BRANCH=${GNID_BRANCH:-"master"}
+export GNID_INCLUDE_DIR=${GNID_INCLUDE_DIR:-"${MAKEOBJDIRPREFIX}/usr/src/lib32/usr/include"}
+export GNID_LIBCRYPTO_DIR=${GNID_LIBCRYPTO_DIR:-"${MAKEOBJDIRPREFIX}/usr/src/secure/lib/libcrypto"}
+
# Area that the final image will appear in
export IMAGES_FINAL_DIR=${IMAGES_FINAL_DIR:-"${SCRATCHDIR}/${PRODUCT_NAME}/"}
OpenPOWER on IntegriCloud