From nobody Tue Dec 05 23:42:58 2023 X-Original-To: dev-commits-src-branches@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 4SlHCR1F20z53dVL; Tue, 5 Dec 2023 23:42:59 +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 4SlHCR01pnz4KHS; Tue, 5 Dec 2023 23:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819779; 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=C7o5sgF1zYFWv5Ghhz5eAoNcHSy8GLpJsxzXkaEzbxU=; b=YYjEMoGoy+XNM8lE/vEb9CqTsTKTLhJQALSD8v7tbrVhLz7LyAwdBi5RPNh8M3gRLcsJZ4 tq/UV+43mqE1ZweJEDsaLEkTbH6q7kvkRKkaBhBPNuD7i8zp3G6witdc6olONbFood36VB VdyderGCUTc8raXkyknL/wbn0S7sUIAmgDbKU5giwrVv8h+/TIB8UZwM9bd4o17SeUwaOI FMem491fmBupggfnAUyMMXrFbPDenxSO+gcmRtG64aSRa2N5stUsjeuho7jhW/MHLKbq3A cMI+8HaRJBGnh5e+DwUmvIEOPhY8Y0Qwnye6vm1t0fWr/YAQ4KufV9zHZaS1vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819779; a=rsa-sha256; cv=none; b=h/wBGy1jpKNrmJ8+1ZaJRdidK6SWrXy6QEWEjo13FYYLCBiIanWiRXVvW5/cZWB8gtq3+O G9qmQJfzxZ4LGH/T3HNuqawJoNj828TXBSthqsFFSzHuBX9v6RuJx5prWJ5VqemZhmMxRZ GMeDITTWRO9z1rayPuItVL26tv2FLrXeFfNzKCe9KX9gMPqogcZrJAo8oWEEV7Gpec4uvC +BpV8McpVpv64Ljpm/eDif0D3IBZCGvcy0Pl9ASC3wh1DE9wJVID+HfxDKtBh8LiImE27H XY30Qm3PpF875Ukl+RTNgFEWsrmQHJEedA/V395ui3jh9q7bpCW/G/K36v6QAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819779; 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=C7o5sgF1zYFWv5Ghhz5eAoNcHSy8GLpJsxzXkaEzbxU=; b=sX4ZGtWL2n7CjPdX3rMcLHiVscgmSCZdclEIrrGGLfFp3sDpWsRSv1RNdBxjI8gJLOAEpE DnDIxhgV1uq6yqX/OXTI2InhBJ8ROWbMccX3nBWCQCbZEaIq39qBylfiWitvNipUHtVF59 9jc7XT3zx6ODX99RqnzbBSGDKtxOzql44wjBj2crpQg0AK2cRRpYYyov8vXfjQcrV6SaBv o3MM90GFRMF52O8mxzHo/itbZw4cbQ78h1i6psq5pIc0xJZNBlCHWux9tRHwpr4Wwf0wcS 2FptNEfhuvltYy4B6kb4stM2pDZC3C9/DA2At/ECBTTjKXRqjOrONAu/XD7sJg== 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 4SlHCQ6BNwzWJh; Tue, 5 Dec 2023 23:42:58 +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 3B5NgwZn045202; Tue, 5 Dec 2023 23:42:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NgwLt045199; Tue, 5 Dec 2023 23:42:58 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:42:58 GMT Message-Id: <202312052342.3B5NgwLt045199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 91cb6905e927 - stable/13 - Makefile.vm: Fix duplicate rc.conf files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 91cb6905e927e034ad14fe698879e5043f2bd329 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=91cb6905e927e034ad14fe698879e5043f2bd329 commit 91cb6905e927e034ad14fe698879e5043f2bd329 Author: Colin Percival AuthorDate: 2023-11-27 21:29:05 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:59 +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 (cherry picked from commit 97bd53ef4d20b7d15e0b0976e885af9438f5637e) --- release/Makefile.vm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 5c47ff9367a8..171ef227a7f0 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -65,6 +65,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 @@ -120,10 +121,11 @@ vm-base: vm-image vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} - mkdir -p ${.OBJDIR}/${.TARGET} + mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ + -C ${.CURDIR}/tools/vmimage.subr \ + -d ${.OBJDIR}/${.TARGET}-${FORMAT} \ -i ${.OBJDIR}/${FORMAT}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FORMAT} . endfor