From owner-svn-src-all@freebsd.org Mon Feb 6 06:15:40 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 584A3CD35EA; Mon, 6 Feb 2017 06:15:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 08548114A; Mon, 6 Feb 2017 06:15:39 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v166FdkM003714; Mon, 6 Feb 2017 06:15:39 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v166FdRc003713; Mon, 6 Feb 2017 06:15:39 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702060615.v166FdRc003713@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 6 Feb 2017 06:15:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r313326 - head/tools/tools/nanobsd/embedded X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2017 06:15:40 -0000 Author: imp Date: Mon Feb 6 06:15:38 2017 New Revision: 313326 URL: https://svnweb.freebsd.org/changeset/base/313326 Log: o Add mkimg to the cross tools, and use the TMPPATH as PATH to pick up mkimg for building on systems like FreeBSD 11.0 that don't have my -a changes. o Set NANO_ROOT and NANO_ALTROOT for std-* since their values don't change when we set NANO_SLICE*. PR: 216829 PR: 216830 Modified: head/tools/tools/nanobsd/embedded/common Modified: head/tools/tools/nanobsd/embedded/common ============================================================================== --- head/tools/tools/nanobsd/embedded/common Mon Feb 6 05:35:11 2017 (r313325) +++ head/tools/tools/nanobsd/embedded/common Mon Feb 6 06:15:38 2017 (r313326) @@ -132,6 +132,7 @@ customize_cmd cust_install_machine_files # NB: leave c++ enabled so devd can be built CONF_BUILD=" +LOCAL_XTOOL_DIRS=usr.bin/mkimg WITHOUT_ACPI=true WITHOUT_ATM=true WITHOUT_AUDIT=true @@ -612,17 +613,23 @@ std-embedded) NANO_SLICE_CFG=s2 NANO_SLICE_ROOT=s3 NANO_SLICE_ALTROOT=s4 + NANO_ROOT=${NANO_SLICE_ROOT}a + NANO_ALTROOT=${NANO_SLICE_ALTROOT}a ;; std-x86) NANO_SLICE_CFG=s1 NANO_SLICE_ROOT=s2 NANO_SLICE_ALTROOT=s3 + NANO_ROOT=${NANO_SLICE_ROOT}a + NANO_ALTROOT=${NANO_SLICE_ALTROOT}a ;; powerpc64-ibm) NANO_SLICE_PPCBOOT=s1 NANO_SLICE_CFG=s2 NANO_SLICE_ROOT=s3 NANO_SLICE_ALTROOT=s4 + NANO_ROOT=${NANO_SLICE_ROOT}a + NANO_ALTROOT=${NANO_SLICE_ALTROOT}a ;; powerpc64-apple) echo Not yet @@ -633,6 +640,8 @@ std-uefi) NANO_SLICE_CFG=s2 NANO_SLICE_ROOT=s3 NANO_SLICE_ALTROOT=s4 + NANO_ROOT=${NANO_SLICE_ROOT} + NANO_ALTROOT=${NANO_SLICE_ALTROOT} ;; std-uefi-bios) NANO_DISK_SCHEME=gpt @@ -641,7 +650,6 @@ std-uefi-bios) NANO_SLICE_CFG=p3 NANO_SLICE_ROOT=p4 NANO_SLICE_ALTROOT=p5 - # override root name NANO_ROOT=${NANO_SLICE_ROOT} NANO_ALTROOT=${NANO_SLICE_ALTROOT} ;; @@ -660,3 +668,8 @@ NANO_SLICE_DATA= # Not included create_diskimage ( ) ( eval create_diskimage_${NANO_DISK_SCHEME} ) + +# Set the path to the same path we use for buldworld to use latest mkimg +NANO_TARGET=$(cd ${NANO_SRC}; ${NANO_MAKE} TARGET_ARCH=${NANO_ARCH} -V _TARGET) +NANO_TMPPATH=$(cd ${NANO_SRC}; ${NANO_MAKE} TARGET=${NANO_TARGET} TARGET_ARCH=${NANO_ARCH} -f Makefile.inc1 buildenv -V TMPPATH) +export PATH="${NANO_TMPPATH}"