diff options
| author | Renato Botelho <renato@netgate.com> | 2017-05-02 08:52:36 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-05-02 09:27:43 -0300 |
| commit | 7b77464780907c20bfc3efa827853842ca316a71 (patch) | |
| tree | 460e001f0565bb4287ebcb5f0c48561ec3f4cc91 | |
| parent | 125d22419ca37e24293dbace154b2a4f9cdc526a (diff) | |
| download | pfsense-7b77464780907c20bfc3efa827853842ca316a71.zip pfsense-7b77464780907c20bfc3efa827853842ca316a71.tar.gz | |
Use libcrypto and includes from MAKEOBJDIRPREFIX instead of the builder objects
| -rw-r--r-- | tools/builder_common.sh | 6 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 560e49b..5350e24 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -537,7 +537,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 b8527b9..26f87b5 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -143,11 +143,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_3"} @@ -191,6 +186,13 @@ else export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs glxsb if_stf coretemp amdtemp aesni sfxge hwpmc vmm nmdm ixgbe"} fi +# 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}/"} |
