From owner-svn-src-head@freebsd.org Sat Apr 29 22:47:58 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 B9BB2D56726 for ; Sat, 29 Apr 2017 22:47:58 +0000 (UTC) (envelope-from markmi@dsl-only.net) Received: from asp.reflexion.net (outbound-mail-210-51.reflexion.net [208.70.210.51]) (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 6A67E1EED for ; Sat, 29 Apr 2017 22:47:57 +0000 (UTC) (envelope-from markmi@dsl-only.net) Received: (qmail 22137 invoked from network); 29 Apr 2017 22:47:56 -0000 Received: from unknown (HELO mail-cs-02.app.dca.reflexion.local) (10.81.19.2) by 0 (rfx-qmail) with SMTP; 29 Apr 2017 22:47:56 -0000 Received: by mail-cs-02.app.dca.reflexion.local (Reflexion email security v8.40.0) with SMTP; Sat, 29 Apr 2017 18:47:56 -0400 (EDT) Received: (qmail 22195 invoked from network); 29 Apr 2017 22:47:56 -0000 Received: from unknown (HELO iron2.pdx.net) (69.64.224.71) by 0 (rfx-qmail) with (AES256-SHA encrypted) SMTP; 29 Apr 2017 22:47:56 -0000 Received: from [192.168.1.106] (c-76-115-7-162.hsd1.or.comcast.net [76.115.7.162]) by iron2.pdx.net (Postfix) with ESMTPSA id A03B7EC81E7; Sat, 29 Apr 2017 15:47:55 -0700 (PDT) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: Re: svn commit: r317169 - head/release/tools Message-Id: Date: Sat, 29 Apr 2017 15:47:55 -0700 To: Glen Barber , svn-src-head@freebsd.org, FreeBSD Toolchain X-Mailer: Apple Mail (2.3273) 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: Sat, 29 Apr 2017 22:47:58 -0000 > Author: gjb > Date: Wed Apr 19 21:18:06 2017 > New Revision: 317169 > URL:=20 > https://svnweb.freebsd.org/changeset/base/317169 >=20 >=20 > Log: > Trim trailing '/release/..' when setting _OBJDIR so arm64/aarch64 > boot1.efifat is properly located when creating virtual machine = images. > =20 > Sponsored by: The FreeBSD Foundation >=20 > Modified: > head/release/tools/vmimage.subr >=20 > Modified: head/release/tools/vmimage.subr > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/release/tools/vmimage.subr Wed Apr 19 20:45:46 2017 = (r317168) > +++ head/release/tools/vmimage.subr Wed Apr 19 21:18:06 2017 = (r317169) > @@ -15,6 +15,7 @@ write_partition_layout() { > fi > =20 > _OBJDIR=3D"$(make -C ${WORLDDIR} -V .OBJDIR)" > + _OBJDIR=3D"$(realpath ${_OBJDIR})" > if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then > = BOOTFILES=3D"/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/bo= ot" > else In my experiments with making my own vmimage I had to make another change. Instead of just: _OBJDIR=3D"$(make -C ${WORLDDIR} -V .OBJDIR)" I had to add a use of realpath around ${WORLDDIR} to get the make -V .OBJDIR output to be correct: _OBJDIR=3D"$(make -C $(realpath ${WORLDDIR}) -V .OBJDIR)" The .. use in WORLDDIR blocked the -V .OBJDIR from returning the relevant/correct path. This in turn lead to -p efi:=3D${BOOTFILES}/efi/boot1/boot1.efifat \ reporting the boot1.efifat as not found. With the additional realpath use the relevant/correct path was returned by -V .OBJDIR and boot1.efifat was found. (This is among other more experimental personal-use changes not appropriate to be checked-in. But the additional realpath use seemed to be appropriate svn content.) Other minor notes: BOOTFILES ends up with a leading // in a lot of contexts (including via the else clause assignment not shown). (Not a problem for me.) Use of /usr/src as the source tree is effectively required? (Not a problem for me.) For some reason aarch64 always has NOSWAP=3D1 and no provision for a swap partition. (This is part of why I was experimenting.) While Makefile.vm has "SWAPSIZE?=3D 1G", much like it has "VMSIZE?=3D 20G", SWAPSIZE does not have an equivalent of: scripts/mk-vmimage.sh: VMSIZE=3D"${OPTARG}" and so any SWAPSIZE control is external and implicit. =3D=3D=3D Mark Millard markmi at dsl-only.net