From owner-dev-commits-src-main@freebsd.org Mon Aug 9 16:06:16 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 629E66571AF; Mon, 9 Aug 2021 16:06:16 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mail.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gk1Cq5jQYz4nm4; Mon, 9 Aug 2021 16:06:15 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1628525168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cOuKk7HjDtP83Dlev83SAVZU0IL+xTm3NFUJBnXUPqI=; b=LG4UKBbIeVpfv5N4g5slQHJ1o0VCjjRPnbfzfXETJgbKhtxpfXJmSTxwCt9JQHiHxQDArz 5U3bW9rzVStEdo7H/Qjn+Ewjr0rKZXwJP8f3Q5IHWB6jv43VLZsF+orWE7ik2BnrbhKfCx MjiseVWpP4YCbIDgJmYqIeUdeYV2c+U= Received: from skull.home.blih.net (lfbn-idf2-1-644-4.w86-247.abo.wanadoo.fr [86.247.100.4]) by mx.blih.net (OpenSMTPD) with ESMTPSA id f403319a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 9 Aug 2021 16:06:08 +0000 (UTC) Date: Mon, 9 Aug 2021 18:06:08 +0200 From: Emmanuel Vadot To: Brad Davis Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: fd17ea8c1849 - main - release: make pkg installs more robust Message-Id: <20210809180608.2e09a6d2d2c5f6ec1d586546@bidouilliste.com> In-Reply-To: <202108091555.179FtIxN054742@gitrepo.freebsd.org> References: <202108091555.179FtIxN054742@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Gk1Cq5jQYz4nm4 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2021 16:06:16 -0000 On Mon, 9 Aug 2021 15:55:18 GMT Brad Davis wrote: > The branch main has been updated by brd: > > URL: https://cgit.FreeBSD.org/src/commit/?id=fd17ea8c1849039c436f7192ca407db70561df03 > > commit fd17ea8c1849039c436f7192ca407db70561df03 > Author: Brad Davis > AuthorDate: 2021-08-09 15:47:03 +0000 > Commit: Brad Davis > CommitDate: 2021-08-09 15:54:08 +0000 > > release: make pkg installs more robust > > Currently pkg(8) will fail to install any package if one is missing, so > make this a loop to prevent one missing package from preventing the rest > from installing. Seen building an AWS AMI for aarch64 on main and > ebsnvme-id is not available in the repo at the moment. > > Approved by: gjb > MFC after: 1 week > Sponsored by: Rubicon Communications, LLC ("Netgate") > --- > release/tools/vmimage.subr | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr > index 6e0c1ea633e2..0e7edb97854a 100644 > --- a/release/tools/vmimage.subr > +++ b/release/tools/vmimage.subr > @@ -131,8 +131,10 @@ vm_extra_install_packages() { > mount -t devfs devfs ${DESTDIR}/dev > chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ > /usr/sbin/pkg bootstrap -y > - chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ > - /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES} > + for p in ${ASSUME_ALWAYS_YES}; do > + chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ > + /usr/sbin/pkg install -y ${p} > + done > umount_loop ${DESTDIR}/dev > > return 0 I assume that what you want is for p in ${VM_EXTRA_PACKAGES} ... -- Emmanuel Vadot