From owner-svn-src-projects@FreeBSD.ORG Wed May 6 18:16:28 2015 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 E51AE69D; Wed, 6 May 2015 18:16:28 +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 BA09519C3; Wed, 6 May 2015 18:16:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t46IGSJs047622; Wed, 6 May 2015 18:16:28 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t46IGSiC047621; Wed, 6 May 2015 18:16:28 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505061816.t46IGSiC047621@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 6 May 2015 18:16:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282564 - projects/release-arm-redux/release 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.20 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, 06 May 2015 18:16:29 -0000 Author: gjb Date: Wed May 6 18:16:27 2015 New Revision: 282564 URL: https://svnweb.freebsd.org/changeset/base/282564 Log: Evaluage chroot_build_release_cmd based on the TARGET/TARGET_ARCH of the build target. Move arm/armv6 'release' bits to chroot_arm_armv6_build_release(). Sponsored by: The FreeBSD Foundation Modified: projects/release-arm-redux/release/release.sh Modified: projects/release-arm-redux/release/release.sh ============================================================================== --- projects/release-arm-redux/release/release.sh Wed May 6 18:04:31 2015 (r282563) +++ projects/release-arm-redux/release/release.sh Wed May 6 18:16:27 2015 (r282564) @@ -124,6 +124,7 @@ env_setup() { # necessary. This is called unconditionally, and overrides the defaults set # in env_setup() if '-c ' is specified. env_check() { + chroot_build_release_cmd="chroot_build_release" # Fix for backwards-compatibility with release.conf that does not have # the trailing '/'. case ${SVNROOT} in @@ -143,6 +144,12 @@ env_check() { WITH_DVD= WITH_COMPRESSED_IMAGES= NODOC=yes + case ${EMBEDDED_TARGET}:${EMBEDDED_TARGET_ARCH} in + arm:armv6) + chroot_build_release_cmd="chroot_arm_armv6_build_release" + ;; + *) + esac fi # If PORTS is set and NODOC is unset, force NODOC=yes because the ports @@ -303,23 +310,26 @@ chroot_build_target() { # chroot_build_release(): Invoke the 'make release' target. chroot_build_release() { load_target_env + eval chroot ${CHROOTDIR} make -C /usr/src/release \ + ${RELEASE_RMAKEFLAGS} release + eval chroot ${CHROOTDIR} make -C /usr/src/release \ + ${RELEASE_RMAKEFLAGS} install DESTDIR=/R \ + WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES} \ + WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES} - if [ -z "${EMBEDDEDBUILD}" ]; then - eval chroot ${CHROOTDIR} make -C /usr/src/release \ - ${RELEASE_RMAKEFLAGS} release - eval chroot ${CHROOTDIR} make -C /usr/src/release \ - ${RELEASE_RMAKEFLAGS} install DESTDIR=/R \ - WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES} \ - WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES} - return 0 - else - load_target_env - # XXX: In progress. - return 0 + return 0 +} # chroot_build_release() + +# chroot_arm_armv6_build_release(): Create arm/armv6 SD card image. +chroot_arm_armv6_build_release() { + load_target_env + # XXX: In progress. + if [ -e "${RELENGDIR}/tools/${TARGET}.subr" ]; then + . "${RELENGDIR}/tools/${TARGET}.subr" fi return 0 -} # chroot_build_release() +} # chroot_arm_armv6_build_release() # main(): Start here. main() { @@ -349,7 +359,7 @@ main() { chroot_setup extra_chroot_setup chroot_build_target - chroot_build_release + ${chroot_build_release_cmd} return 0 } # main()