Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 May 2015 16:04:12 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r282556 - projects/release-arm-redux/release
Message-ID:  <201505061604.t46G4CdG080181@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Wed May  6 16:04:11 2015
New Revision: 282556
URL: https://svnweb.freebsd.org/changeset/base/282556

Log:
  Remove Crochet invocation.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-arm-redux/release/release.sh

Modified: projects/release-arm-redux/release/release.sh
==============================================================================
--- projects/release-arm-redux/release/release.sh	Wed May  6 15:59:29 2015	(r282555)
+++ projects/release-arm-redux/release/release.sh	Wed May  6 16:04:11 2015	(r282556)
@@ -313,27 +313,9 @@ chroot_build_release() {
 			WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES}
 		return 0
 	else
-	# Embedded builds do not use the 'make release' target.
-		buildenv_setup
-		# If a crochet configuration file exists in *this* checkout of
-		# release/, copy it to the /tmp/external directory within the
-		# chroot.  This allows building embedded releases without
-		# relying on updated scripts and/or configurations to exist in
-		# the branch being built.
 		load_target_env
-		if [ -e ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf ] && \
-			[ -e ${RELENGDIR}/${XDEV}/release.sh ]; then
-				mkdir -p ${CHROOTDIR}/tmp/external/${XDEV}/
-				cp ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf \
-					${CHROOTDIR}/tmp/external/${XDEV}/crochet-${KERNEL}.conf
-				/bin/sh ${RELENGDIR}/${XDEV}/release.sh
-				return 0
-		fi
-		# If the script does not exist for this architecture, exit.
-		# This probably should be checked earlier, but allowing the
-		# rest of the build process to get this far will at least set
-		# up the chroot environment for testing.
-		return 1
+		# XXX: In progress.
+		return 0
 	fi
 
 	return 0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505061604.t46G4CdG080181>