diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-24 13:10:52 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-24 13:10:52 -0300 |
| commit | d94da29844316954348a3f7c97fff93de15051f9 (patch) | |
| tree | f0013c3a9da5089b09ef72b414df11013b9af691 /tools | |
| parent | f1e89d805a361a784e6a315073cf1bf6c43c643d (diff) | |
| download | pfsense-d94da29844316954348a3f7c97fff93de15051f9.zip pfsense-d94da29844316954348a3f7c97fff93de15051f9.tar.gz | |
Automatically set meta pkgs version based on timestamp for snapshots
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index e8b1230..d8e96cf 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1898,6 +1898,10 @@ poudriere_update_ports() { if ! poudriere ports -l | grep -q -E "^${POUDRIERE_PORTS_NAME}[[:blank:]]"; then poudriere_create_ports_tree else + echo -n ">>> Reseting local changes on ports tree ${POUDRIERE_PORTS_NAME}... " | tee -a ${LOGFILE} + script -aq ${LOGFILE} git -C "/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}" reset --hard >/dev/null 2>&1 + script -aq ${LOGFILE} git -C "/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}" clean -fxd >/dev/null 2>&1 + echo "Done!" | tee -a ${LOGFILE} echo -n ">>> Updating ports tree ${POUDRIERE_PORTS_NAME}... " | tee -a ${LOGFILE} script -aq ${LOGFILE} poudriere ports -u -p "${POUDRIERE_PORTS_NAME}" >/dev/null 2>&1 echo "Done!" | tee -a ${LOGFILE} @@ -1923,6 +1927,15 @@ poudriere_bulk() { cp -f "${BUILDER_TOOLS}/conf/pfPorts/make.conf" /usr/local/etc/poudriere.d/${POUDRIERE_PORTS_NAME}-make.conf fi + # Change version of pfSense meta ports for snapshots + if [ -z "${_IS_RELEASE}" ]; then + for meta_pkg in ${PRODUCT_NAME} ${PRODUCT_NAME}-vmware; do + local _meta_pkg_version="$(echo "${PRODUCT_VERSION}" | sed 's,DEVELOPMENT,ALPHA,')-${DATESTRING}" + sed -i '' -e "/^DISTVERSION/ s,^.*,DISTVERSION= ${_meta_pkg_version}," \ + /usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/security/${meta_pkg}/Makefile + done + fi + for jail_arch in ${_archs}; do jail_name=$(poudriere_jail_name ${jail_arch}) |
