Index: user/gjb/hacking/release-embedded/release/tools/arm/crochet-BEAGLEBONE.conf
===================================================================
--- user/gjb/hacking/release-embedded/release/tools/arm/crochet-BEAGLEBONE.conf	(revision 261238)
+++ user/gjb/hacking/release-embedded/release/tools/arm/crochet-BEAGLEBONE.conf	(revision 261239)
@@ -1,29 +1,29 @@
 #
 # $FreeBSD$
 #
 
 # This is the configuration file for use with crochet to produce
 # FreeBSD BeagleBone images.
 
 board_setup BeagleBone
 option ImageSize 1gb
 option AutoSize
 
 export MAKEOBJDIRPREFIX=/usr/obj
 FREEBSD_SRC=/usr/src
 __MAKE_CONF=/dev/null
 SRCCONF=/dev/null
 WORKDIR=/usr/obj
 _BRANCH=$(make -C ${FREEBSD_SRC}/release -V BRANCH)
 _REVISION=$(make -C ${FREEBSD_SRC}/release -V REVISION)
 KERNCONF=BEAGLEBONE
 TARGET=arm
 TARGET_ARCH=armv6
 FREEBSD_BUILDWORLD_EXTRA_ARGS=""
 FREEBSD_INSTALLWORLD_EXTRA_ARGS=""
 FREEBSD_BUILDKERNEL_EXTRA_ARGS=""
 FREEBSD_INSTALLKERNEL_EXTRA_ARGS=""
 FREEBSD_WORLD_EXTRA_ARGS=""
 FREEBSD_KERNEL_EXTRA_ARGS=""
 FREEBSD_EXTRA_ARGS=""
-IMG=${WORKDIR}/FreeBSD-${_REVISION}-${_BRANCH}-${KERNCONF}.img
+IMG=${WORKDIR}/FreeBSD-${_REVISION}-${_BRANCH}-${TARGET}-${TARGET_ARCH}-${KERNCONF}.img
Index: user/gjb/hacking/release-embedded/release/tools/arm/crochet-PANDABOARD.conf
===================================================================
--- user/gjb/hacking/release-embedded/release/tools/arm/crochet-PANDABOARD.conf	(revision 261238)
+++ user/gjb/hacking/release-embedded/release/tools/arm/crochet-PANDABOARD.conf	(revision 261239)
@@ -1,29 +1,29 @@
 #
 # $FreeBSD$
 #
 
 # This is the configuration file for use with crochet to produce
 # FreeBSD PandaBoard images.
 
 board_setup PandaBoard
 option ImageSize 1gb
 option AutoSize
 
 export MAKEOBJDIRPREFIX=/usr/obj
 FREEBSD_SRC=/usr/src
 __MAKE_CONF=/dev/null
 SRCCONF=/dev/null
 WORKDIR=/usr/obj
 _BRANCH=$(make -C ${FREEBSD_SRC}/release -V BRANCH)
 _REVISION=$(make -C ${FREEBSD_SRC}/release -V REVISION)
 KERNCONF=PANDABOARD
 TARGET=arm
 TARGET_ARCH=armv6
 FREEBSD_BUILDWORLD_EXTRA_ARGS=""
 FREEBSD_INSTALLWORLD_EXTRA_ARGS=""
 FREEBSD_BUILDKERNEL_EXTRA_ARGS=""
 FREEBSD_INSTALLKERNEL_EXTRA_ARGS=""
 FREEBSD_WORLD_EXTRA_ARGS=""
 FREEBSD_KERNEL_EXTRA_ARGS=""
 FREEBSD_EXTRA_ARGS=""
-IMG=${WORKDIR}/FreeBSD-${_REVISION}-${_BRANCH}-${KERNCONF}.img
+IMG=${WORKDIR}/FreeBSD-${_REVISION}-${_BRANCH}-${TARGET}-${TARGET_ARCH}-${KERNCONF}.img
Index: user/gjb/hacking/release-embedded/release/tools/arm/crochet-RPI-B.conf
===================================================================
--- user/gjb/hacking/release-embedded/release/tools/arm/crochet-RPI-B.conf	(revision 261238)
+++ user/gjb/hacking/release-embedded/release/tools/arm/crochet-RPI-B.conf	(revision 261239)
@@ -1,29 +1,29 @@
 #
 # $FreeBSD$
 #
 
 # This is the configuration file for use with crochet to produce
 # FreeBSD Raspberry Pi images.
 
 board_setup RaspberryPi
 option ImageSize 1gb
 option AutoSize
 
 export MAKEOBJDIRPREFIX=/usr/obj
 FREEBSD_SRC=/usr/src
 __MAKE_CONF=/dev/null
 SRCCONF=/dev/null
 WORKDIR=/usr/obj
 _BRANCH=$(make -C ${FREEBSD_SRC}/release -V BRANCH)
 _REVISION=$(make -C ${FREEBSD_SRC}/release -V REVISION)
 KERNCONF=RPI-B
 TARGET=arm
 TARGET_ARCH=armv6
 FREEBSD_BUILDWORLD_EXTRA_ARGS=""
 FREEBSD_INSTALLWORLD_EXTRA_ARGS=""
 FREEBSD_BUILDKERNEL_EXTRA_ARGS=""
 FREEBSD_INSTALLKERNEL_EXTRA_ARGS=""
 FREEBSD_WORLD_EXTRA_ARGS=""
 FREEBSD_KERNEL_EXTRA_ARGS=""
 FREEBSD_EXTRA_ARGS=""
-IMG=${WORKDIR}/FreeBSD-${_REVISION}-${_BRANCH}-${KERNCONF}.img
+IMG=${WORKDIR}/FreeBSD-${_REVISION}-${_BRANCH}-${TARGET}-${TARGET_ARCH}-${KERNCONF}.img