git: fd17ea8c1849 - main - release: make pkg installs more robust

[Emmanuel Vadot]

On Mon, 9 Aug 2021 15:55:18 GMT
Brad Davis <brd at FreeBSD.org> wrote:

> The branch main has been updated by brd:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=fd17ea8c1849039c436f7192ca407db70561df03
> 
> commit fd17ea8c1849039c436f7192ca407db70561df03
> Author:     Brad Davis <brd at FreeBSD.org>
> AuthorDate: 2021-08-09 15:47:03 +0000
> Commit:     Brad Davis <brd at FreeBSD.org>
> 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 <manu at bidouilliste.com> <manu at freebsd.org>