From owner-svn-src-projects@FreeBSD.ORG Wed Oct 1 17:05:42 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09610911; Wed, 1 Oct 2014 17:05:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E96D16E0; Wed, 1 Oct 2014 17:05:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s91H5fFt094942; Wed, 1 Oct 2014 17:05:41 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s91H5fKo094939; Wed, 1 Oct 2014 17:05:41 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201410011705.s91H5fKo094939@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 1 Oct 2014 17:05:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272376 - in projects/release-vmimage/release: . amd64 i386 scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Oct 2014 17:05:42 -0000 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}) [...]" - 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}) [...]" - 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)