From owner-svn-src-head@freebsd.org Wed Apr 19 12:39:47 2017 Return-Path: Delivered-To: svn-src-head@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 04837D448D1; Wed, 19 Apr 2017 12:39:47 +0000 (UTC) (envelope-from n_hibma@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 AED4BA45; Wed, 19 Apr 2017 12:39:46 +0000 (UTC) (envelope-from n_hibma@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3JCdjm5080807; Wed, 19 Apr 2017 12:39:45 GMT (envelope-from n_hibma@FreeBSD.org) Received: (from n_hibma@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3JCdjCJ080806; Wed, 19 Apr 2017 12:39:45 GMT (envelope-from n_hibma@FreeBSD.org) Message-Id: <201704191239.v3JCdjCJ080806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: n_hibma set sender to n_hibma@FreeBSD.org using -f From: Nick Hibma Date: Wed, 19 Apr 2017 12:39:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317136 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2017 12:39:47 -0000 Author: n_hibma Date: Wed Apr 19 12:39:45 2017 New Revision: 317136 URL: https://svnweb.freebsd.org/changeset/base/317136 Log: A test was moved but without the definition of $d. The test however always succeeds because 'test -d' always returns true. Also some speling fixes. Modified: head/tools/tools/nanobsd/embedded/common Modified: head/tools/tools/nanobsd/embedded/common ============================================================================== --- head/tools/tools/nanobsd/embedded/common Wed Apr 19 11:38:07 2017 (r317135) +++ head/tools/tools/nanobsd/embedded/common Wed Apr 19 12:39:45 2017 (r317136) @@ -65,7 +65,7 @@ # Long Term # o common tooling for creating images for odd-ball platforms # o support for boot loaders other than uboot in the image -# or via special insturctions +# or via special instructions # o No pony support. Sadly, you cannot have a pony. # @@ -343,8 +343,8 @@ die( ) { # Automatically include the packaging port here so it is always first so it # builds the port and adds the package so we can add other packages. #XXX Doesn't work for cross build, so punting until I can integreate qemu-static -#XXX or poudere, both of which require priv'd execution. Or qemu-system, which -#XXX is super, super slow. +#XXX or poudriere, both of which require priv'd execution. Or qemu-system, +#XXX which is super, super slow. #add_port ports-mgmt/pkg #add_port security/sudo #add_port ftp/curl @@ -480,6 +480,7 @@ dos_boot_part ( ) ( ) if [ -n "$NANO_BOOT_PKG" ]; then + local d=/usr/local/share/u-boot/${NANO_BOOT_PKG} if [ ! -d ${d} ]; then echo ${NANO_BOOT_PKG} not installed. Sadly, it must be. exit 1 @@ -492,7 +493,7 @@ if [ -n "$NANO_BOOT_PKG" ]; then fi product_custom ( ) ( - # not quie ready to tweak these in nopriv build + # not quite ready to tweak these in nopriv build if [ -z ${NANO_NOPRIV_BUILD} ]; then # Last second tweaks -- generally not needed chown -R root:wheel ${NANO_WORLDDIR}/root