Attachment 188108 Details for Bug 223741 – refactor common code in release.sh

[patch] refactor common code in release.sh

diff.out.common_code (text/plain), 1.67 KB, created by Mark Linimon on 2017-11-19 04:19:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Linimon

Created: 2017-11-19 04:19:37 UTC

Size: 1.67 KB

patch

obsolete

>Index: release.sh
>===================================================================
>--- release.sh	(revision 325984)
>+++ release.sh	(working copy)
>@@ -276,28 +276,23 @@
> 		REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
> 		BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
> 		UNAME_r=${REVISION}-${BRANCH}
>+		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
>+		PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
>+		PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
>+
> 		if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then
>-			PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
>-			PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
>-			PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
> 			chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
> 				${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
> 				FORCE_PKG_REGISTER=1 \
> 				install clean distclean
> 		fi
>-	fi
> 
>-	if [ ! -z "${EMBEDDEDPORTS}" ]; then
>-		_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
>-		REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
>-		BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
>-		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
>-		PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
>-		PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
>-		for _PORT in ${EMBEDDEDPORTS}; do
>-			eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
>-				FORCE_PKG_REGISTER=1 ${PBUILD_FLAGS} install clean distclean
>-		done
>+		if [ ! -z "${EMBEDDEDPORTS}" ]; then
>+			for _PORT in ${EMBEDDEDPORTS}; do
>+				eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
>+					FORCE_PKG_REGISTER=1 ${PBUILD_FLAGS} install clean distclean
>+			done
>+		fi
> 	fi
> 
> 	buildenv_setup

Actions: View | Diff

Attachments on bug 223741: 188108