View | Details | Raw Unified | Return to bug 223741
Collapse All | Expand All

(-)release.sh (-15 / +10 lines)
Lines 276-303 Link Here
276
		REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
276
		REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
277
		BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
277
		BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
278
		UNAME_r=${REVISION}-${BRANCH}
278
		UNAME_r=${REVISION}-${BRANCH}
279
		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
280
		PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
281
		PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
282
279
		if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then
283
		if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then
280
			PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
281
			PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
282
			PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
283
			chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
284
			chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
284
				${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
285
				${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
285
				FORCE_PKG_REGISTER=1 \
286
				FORCE_PKG_REGISTER=1 \
286
				install clean distclean
287
				install clean distclean
287
		fi
288
		fi
288
	fi
289
289
290
	if [ ! -z "${EMBEDDEDPORTS}" ]; then
290
		if [ ! -z "${EMBEDDEDPORTS}" ]; then
291
		_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
291
			for _PORT in ${EMBEDDEDPORTS}; do
292
		REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
292
				eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
293
		BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
293
					FORCE_PKG_REGISTER=1 ${PBUILD_FLAGS} install clean distclean
294
		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
294
			done
295
		PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
295
		fi
296
		PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
297
		for _PORT in ${EMBEDDEDPORTS}; do
298
			eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
299
				FORCE_PKG_REGISTER=1 ${PBUILD_FLAGS} install clean distclean
300
		done
301
	fi
296
	fi
302
297
303
	buildenv_setup
298
	buildenv_setup

Return to bug 223741