diff options
Diffstat (limited to 'tools/builder_defaults.sh')
| -rw-r--r-- | tools/builder_defaults.sh | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 18556d0..eb0e173 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -84,7 +84,7 @@ fi # Make sure pkg will not be interactive export ASSUME_ALWAYS_YES=true -# Architecture, supported ARCH values are: +# Architecture, supported ARCH values are: # Tier 1: i386, AMD64, and PC98 # Tier 2: ARM, PowerPC, ia64, Sparc64 and sun4v # Tier 3: MIPS and S/390 @@ -107,6 +107,7 @@ fi export PRODUCT_NAME=${PRODUCT_NAME:-"nonSense"} export PRODUCT_URL=${PRODUCT_URL:-""} export PRODUCT_SRC=${PRODUCT_SRC:-"${BUILDER_ROOT}/src"} +export PRODUCT_EMAIL=${PRODUCT_EMAIL:-"coreteam@pfsense.org"} if [ "${PRODUCT_NAME}" = "pfSense" -a "${BUILD_AUTHORIZED_BY_ELECTRIC_SHEEP_FENCING}" != "yes" ]; then echo ">>>ERROR: According the following license, only Electric Sheep Fencing can build genuine pfSense® software" @@ -133,7 +134,7 @@ else export GIT_REPO_BRANCH_OR_TAG="${_cur_git_repo_branch_or_tag}" fi -GIT_REPO_BASE=$(git -C ${BUILDER_ROOT} config --get remote.origin.url | sed 's,/[^/]*,,') +GIT_REPO_BASE=$(git -C ${BUILDER_ROOT} config --get remote.origin.url | sed -e 's,/[^/]*$,,') # This is used for using svn for retrieving src export FREEBSD_REPO_BASE=${FREEBSD_REPO_BASE:-"${GIT_REPO_BASE}/freebsd-src.git"} @@ -175,7 +176,7 @@ export MAKEJ_KERNEL=${MAKEJ_KERNEL:-"${_CPUS}"} if [ "${TARGET}" = "i386" ]; then export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs glxsb if_stf coretemp amdtemp hwpmc"} else - export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs glxsb if_stf coretemp amdtemp aesni sfxge hwpmc"} + export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs glxsb if_stf coretemp amdtemp aesni sfxge hwpmc vmm nmdm"} fi # Area that the final image will appear in @@ -211,7 +212,7 @@ export VMDK_DISK_CAPACITY_IN_GB=${VMDK_DISK_CAPACITY_IN_GB:-"8"} export OVA_FIRST_PART_SIZE_IN_GB=${OVA_FIRST_PART_SIZE_IN_GB:-"6"} # swap partition size (freebsd-swap) export OVA_SWAP_PART_SIZE_IN_GB=${OVA_SWAP_PART_SIZE_IN_GB:-"2"} -# Calculate real swap size, removing 128 blocks (65536 bytes) beggining/loader +# Calculate real swap size, removing 128 blocks (65536 bytes) beginning/loader export OVA_SWAP_PART_SIZE=$((${OVA_SWAP_PART_SIZE_IN_GB}*1024*1024*1024-65536)) # Temporary place to save files export OVA_TMP=${OVA_TMP:-"${SCRATCHDIR}/ova_tmp"} @@ -261,7 +262,7 @@ fi echo "$BUILTDATESTRING" > $BUILTDATESTRINGFILE # Poudriere -export ZFS_TANK=${ZFS_TANK:-"tank"} +export ZFS_TANK=${ZFS_TANK:-"zroot"} export ZFS_ROOT=${ZFS_ROOT:-"/poudriere"} export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}"} @@ -273,9 +274,13 @@ export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"devel"} export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"} export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"} export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"} +export PKG_RSYNC_LOGS=${PKG_RSYNC_LOGS:-"/usr/local/www/beta"} export PKG_REPO_SERVER=${PKG_REPO_SERVER:-"pkg+http://beta.pfsense.org/packages"} export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${GIT_REPO_BRANCH_OR_TAG}"} +# Command used to sign pkg repo +export PKG_REPO_SIGNING_COMMAND=${PKG_REPO_SIGNING_COMMAND:-""} + unset _IS_RELEASE unset CORE_PKG_DATESTRING export TIMESTAMP_SUFFIX="-${DATESTRING}" @@ -303,8 +308,16 @@ esac # Define base package version, based on date for snaps export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}" export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}_${TARGET}_${TARGET_ARCH}-core"} +export CORE_PKG_REAL_PATH="${CORE_PKG_PATH}/.real_$(date +%s)" export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"} +export PKG_REPO_BASE=${PKG_REPO_BASE:-"${FREEBSD_SRC_DIR}/release/pkg_repos"} +export PKG_REPO_TEMPLATE=${PKG_REPO_TEMPLATE:-"${PKG_REPO_BASE}/${PRODUCT_NAME}.conf.template"} +export PKG_REPO_DEVEL_TEMPLATE=${PKG_REPO_TEMPLATE:-"${PKG_REPO_BASE}/${PRODUCT_NAME}-devel.conf.template"} +export PKG_REPO_PATH=${PKG_REPO_PATH:-"/usr/local/etc/pkg/repos/${PRODUCT_NAME}.conf"} + +export PRODUCT_SHARE_DIR=${PRODUCT_SHARE_DIR:-"/usr/local/share/${PRODUCT_NAME}"} + # Package overlay. This gives people a chance to build product # installable image that already contains certain extra packages. # @@ -337,3 +350,13 @@ mkdir -p ${STAGINGAREA} export SNAPSHOTSLOGFILE=${SNAPSHOTSLOGFILE:-"${SCRATCHDIR}/snapshots-build.log"} export SNAPSHOTSLASTUPDATE=${SNAPSHOTSLASTUPDATE:-"${SCRATCHDIR}/snapshots-lastupdate.log"} + +if [ -n "${POUDRIERE_SNAPSHOTS}" ]; then + export SNAPSHOTS_RSYNCIP=${PKG_RSYNC_HOSTNAME} + export SNAPSHOTS_RSYNCUSER=${PKG_RSYNC_USERNAME} + export SNAPSHOTS_RSYNCLOGS=${PKG_RSYNC_LOGS} +else + export SNAPSHOTS_RSYNCIP=${RSYNCIP} + export SNAPSHOTS_RSYNCUSER=${RSYNCUSER} + export SNAPSHOTS_RSYNCLOGS=${RSYNCLOGS} +fi |
