From nobody Mon Nov 27 21:35:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfJmK55HDz53GP4; Mon, 27 Nov 2023 21:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfJmK4FG4z4f9w; Mon, 27 Nov 2023 21:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701120945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SQhHgtfPmGijvQzG6uE/B6JcKn3qE07R0xKE1TnX/ss=; b=JVtgjaIE/AAsQwUnpgc64DyZdK6MypzO+uZgK/PwmCqbmqpltg+m58GuBfu7YRFFCK0JnY 6zhnGgdDmazvwubEn5raOcBN/rkszlYhiBJk3Pl7Dbe3Xho7mdeyKQkuaQq2jNQ8Tk5mr3 sVUe/5vaWqS95MuiLdh2EHLdvVOi587pAlHcjjds/bTaMFczA6JcJyX85nxFy7dF4Tn9oa 3UcxTZwvnW+aNyvkhVIYSjBKjroxwxv6JLW7B5aD4YYWIBDPphE9dqdPseylLztQ+hOs1d M0Hl+bYptyv2VUeRzGbDT511+z9yo6QYoSk9cxLI3S9xkfkkZ++u8/+te76Z1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701120945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SQhHgtfPmGijvQzG6uE/B6JcKn3qE07R0xKE1TnX/ss=; b=JqPmz9jwdpNRpw9fymvQR5g4XMt49m4sWCfPYPW5FoeK92+hae0yhgYYImEjm1hKeBxCp6 P8jgD1TCdrztasE8QdiZ0q66pqL/rylWurYYhxV95Gz5/VpV1uK2OvpjoTU+iQ/ihovvSK lJu4OoU029i4KwpfoaguELUvfQ4uK9A4yBL8KHHQqfaaw8oxLrdDOgJFrMhFifcv2YNAfy pBt6zutp0eeNhXPtvO7JFbhDfgZ70jzU0g4bjUIba8JDyDxdEjayxmhIY1f2MMSJqJsUtl UQ1MBE0M9xTXimFpt/dARNkzb2d0BsbZrHef4/xy4UP/ByxLt5Luv8ArelfvYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701120945; a=rsa-sha256; cv=none; b=xoWUnXXS+Fn2zrYgf7YlnsJqOpttLQ/8l7LeOJgo4UViCUftdEcHwM2F5r+MDFoUBha9zn eL+LSBiK728a6zyiD4Xc3BpSD5UeNXfq+9rPEiYHENF7yDt3I7LeODZMgJHSQMGWsyv6r7 He+o/uxiOExH6LYQ4Zx/vvehDFM8gdwwqS2FEtO99EXf0P7Eif4k0S4/3Czcz7YCkeqRU1 eZgeGSB9QMs46R2kKaHdnlUGySZMyWLk2UNXxSkTaG34o0RZ6PbBl+W4tFVKnHCo+ei+Fv lCwbd24AncLB7fkv/fRSyWBP8ascmIWFPnZX9lBfxlIQQY4CmmMWcTijk01tXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfJmK3J5Nzv7J; Mon, 27 Nov 2023 21:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARLZjrL020488; Mon, 27 Nov 2023 21:35:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARLZjCw020485; Mon, 27 Nov 2023 21:35:45 GMT (envelope-from git) Date: Mon, 27 Nov 2023 21:35:45 GMT Message-Id: <202311272135.3ARLZjCw020485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 97bd53ef4d20 - main - Makefile.vm: Fix duplicate rc.conf files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97bd53ef4d20b7d15e0b0976e885af9438f5637e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=97bd53ef4d20b7d15e0b0976e885af9438f5637e commit 97bd53ef4d20b7d15e0b0976e885af9438f5637e Author: Colin Percival AuthorDate: 2023-11-27 21:29:05 +0000 Commit: Colin Percival CommitDate: 2023-11-27 21:35:41 +0000 Makefile.vm: Fix duplicate rc.conf files Two bugs in Makefile.vm resulted in disk images being "built" multiple times, resulting in lines added to /etc/rc.conf being duplicated: 1. The vm-image target reused the same "staging tree" directory for all of its builds (multiple disk image types and multiple filesystem types). 2. The cw-type-flavour-fs target depends on emulator-portinstall, which did not have a 'touch ${.TARGET}' and thus re-ran every time -- and caused the cw-type-flavour-fs target to be re-run. This was triggered by release builds running `make cloudware-release` (creating the disk images) followed by `make ec2amis` (which re-created the disk images prior to uploading them). MFC After: 1 week Sponsored by: https://www.patreon.com/cperciva --- release/Makefile.vm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 1a58a548b9f4..a7624775d48c 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -81,6 +81,7 @@ emulator-portinstall: env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static .endif .endif + touch ${.TARGET} QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static .endif @@ -137,10 +138,11 @@ vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} . for FS in ${VMFSLIST} - mkdir -p ${.OBJDIR}/${.TARGET} + mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${FS} \ + -C ${.CURDIR}/tools/vmimage.subr \ + -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ -i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} . endfor