From 0dc54b44a817660df92f2c533f17f79373c36180 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Tue, 28 Jan 2014 17:27:56 +0000 Subject: [PATCH] Include 'TARGET-TARGET_ARCH' in the resulting image name similar to 'make -V OSRELEASE' output. This probably should use 'make -V OSRELEASE' directly, but for now, this keeps the line length reasonable for readability. Sponsored by: The FreeBSD Foundation --- release/tools/arm/crochet-BEAGLEBONE.conf | 2 +- release/tools/arm/crochet-PANDABOARD.conf | 2 +- release/tools/arm/crochet-RPI-B.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/tools/arm/crochet-BEAGLEBONE.conf b/release/tools/arm/crochet-BEAGLEBONE.conf index f1d394447e74..0a37f35ef3bd 100644 --- a/release/tools/arm/crochet-BEAGLEBONE.conf +++ b/release/tools/arm/crochet-BEAGLEBONE.conf @@ -26,4 +26,4 @@ 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 diff --git a/release/tools/arm/crochet-PANDABOARD.conf b/release/tools/arm/crochet-PANDABOARD.conf index faa1c8355753..bf333a44507a 100644 --- a/release/tools/arm/crochet-PANDABOARD.conf +++ b/release/tools/arm/crochet-PANDABOARD.conf @@ -26,4 +26,4 @@ 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 diff --git a/release/tools/arm/crochet-RPI-B.conf b/release/tools/arm/crochet-RPI-B.conf index 91f297d00c19..48887793e414 100644 --- a/release/tools/arm/crochet-RPI-B.conf +++ b/release/tools/arm/crochet-RPI-B.conf @@ -26,4 +26,4 @@ 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