Remove Crochet invocation.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
gjb 2015-05-06 16:04:11 +00:00
parent 1289a25572
commit c0b6e73450

View File

@ -313,27 +313,9 @@ chroot_build_release() {
WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES} WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES}
return 0 return 0
else 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 load_target_env
if [ -e ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf ] && \ # XXX: In progress.
[ -e ${RELENGDIR}/${XDEV}/release.sh ]; then return 0
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
fi fi
return 0 return 0