svn commit: r272376 - in projects/release-vmimage/release: . amd64 i386 scripts
Glen Barber
gjb at FreeBSD.org
Wed Oct 1 17:05:42 UTC 2014
Author: gjb
Date: Wed Oct 1 17:05:40 2014
New Revision: 272376
URL: https://svnweb.freebsd.org/changeset/base/272376
Log:
Separate release/scripts/mk-vmimage.sh to machine-specific
scripts, making it possible to mimic the functionality for
non-x86 targets.
Move echo output if MAKEFLAGS is empty outside of usage().
Remove TARGET/TARGET_ARCH evaluation.
Sponsored by: The FreeBSD Foundation
Added:
projects/release-vmimage/release/amd64/mk-vmimage.sh
- copied, changed from r272373, projects/release-vmimage/release/scripts/mk-vmimage.sh
projects/release-vmimage/release/i386/mk-vmimage.sh
- copied, changed from r272373, projects/release-vmimage/release/scripts/mk-vmimage.sh
Deleted:
projects/release-vmimage/release/scripts/mk-vmimage.sh
Modified:
projects/release-vmimage/release/Makefile
Modified: projects/release-vmimage/release/Makefile
==============================================================================
--- projects/release-vmimage/release/Makefile Wed Oct 1 16:48:54 2014 (r272375)
+++ projects/release-vmimage/release/Makefile Wed Oct 1 17:05:40 2014 (r272376)
@@ -321,7 +321,7 @@ vm-base:
VMBASE=${VMBASE}.img VMSIZE=${VMSIZE} \
DESTDIR=${.OBJDIR}/${.TARGET} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/scripts/mk-vmimage.sh ${.TARGET}
+ ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET}
.endif
touch ${.TARGET}
@@ -330,7 +330,7 @@ vm-image: vm-base
. for FORMAT in ${VMFORMATS}
env FORMAT=${FORMAT} VMIMAGE=${VMBASE}.${FORMAT} VMBASE=${VMBASE}.img \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/scripts/mk-vmimage.sh ${.TARGET}
+ ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET}
. endfor
.endif
touch ${.TARGET}
Copied and modified: projects/release-vmimage/release/amd64/mk-vmimage.sh (from r272373, projects/release-vmimage/release/scripts/mk-vmimage.sh)
==============================================================================
--- projects/release-vmimage/release/scripts/mk-vmimage.sh Wed Oct 1 16:18:59 2014 (r272373, copy source)
+++ projects/release-vmimage/release/amd64/mk-vmimage.sh Wed Oct 1 17:05:40 2014 (r272376)
@@ -37,9 +37,6 @@ export PATH
usage() {
echo "$(basename ${0}) <command> <target> [...]"
- if [ -z "${MAKEFLAGS}" ]; then
- echo "It is probably not safe to run this by hand yet..."
- fi
exit 1
}
@@ -128,15 +125,9 @@ vm_create_vmdisk() {
main() {
cmd="${1}"
- case ${TARGET}/${TARGET_ARCH} in
- amd64/amd64|i386/i386)
- # FALLTHROUGH
- ;;
- *)
- # EX_CANTCREAT
- return 0
- ;;
- esac
+ if [ -z "${MAKEFLAGS}" ]; then
+ echo "It is probably not safe to run this by hand yet..."
+ fi
case ${cmd} in
vm-base)
Copied and modified: projects/release-vmimage/release/i386/mk-vmimage.sh (from r272373, projects/release-vmimage/release/scripts/mk-vmimage.sh)
==============================================================================
--- projects/release-vmimage/release/scripts/mk-vmimage.sh Wed Oct 1 16:18:59 2014 (r272373, copy source)
+++ projects/release-vmimage/release/i386/mk-vmimage.sh Wed Oct 1 17:05:40 2014 (r272376)
@@ -37,9 +37,6 @@ export PATH
usage() {
echo "$(basename ${0}) <command> <target> [...]"
- if [ -z "${MAKEFLAGS}" ]; then
- echo "It is probably not safe to run this by hand yet..."
- fi
exit 1
}
@@ -128,15 +125,9 @@ vm_create_vmdisk() {
main() {
cmd="${1}"
- case ${TARGET}/${TARGET_ARCH} in
- amd64/amd64|i386/i386)
- # FALLTHROUGH
- ;;
- *)
- # EX_CANTCREAT
- return 0
- ;;
- esac
+ if [ -z "${MAKEFLAGS}" ]; then
+ echo "It is probably not safe to run this by hand yet..."
+ fi
case ${cmd} in
vm-base)
More information about the svn-src-projects
mailing list