From nobody Tue Dec 05 23:40:17 2023 X-Original-To: dev-commits-src-all@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 4SlH8L1cv1z53d43; Tue, 5 Dec 2023 23:40:18 +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 4SlH8L153dz4JJK; Tue, 5 Dec 2023 23:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701819618; 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=zGkAv4Hht4Ssqg6FFLzLQvPkmOqsdLQdHybqw1u13M0=; b=MCxBTqt2YZ5kOQCM3vEBy2CFO29IqM0b6XOJSebvzQ7ozFXMW66ObyNzwk8WsnYYGOGWNn pft65MoWEjfJg4xrdOYNaMJCXFjnJog8Xlplkg/+ozVfq6hNeYrooHDsAFChTkmXkQf+9w B+BjWzb4tT+UIS6QqrABEFJO0nA3NX2c+uEWdfoyXkmV3x4wM+5OhqljrC7knteIDYB4nn n2Jx29LgrokhrmBIaTQy8XcNobSErMwMHzZClC/7bddA2ISR9qCJMexUEhLdy0lprQN2dW DWUXUcoGkC8egNHTKTmG+HAFLnsYe/Iu70IjNDVuOY9s8r2x0+/0dyHQOlrxyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701819618; a=rsa-sha256; cv=none; b=DItxd+AD9lE0+elFGv4TCd+6llXcU3XAzxzehKSRwtIORdzxIAkCZKwMNPVadvOHdh6aLM DgESAvi8QHBLcKrzNZ1eeCwZ/KnQ3I0bQqRbC+FIn1RCmxT2vrPsZNmgESU+PSCHJX6yfU IDoZHpIXBlNAVqnmqMNISGVI9YDtll8tEoewTH1hZyN4TXXCtm8000C41fkCIR9ExcVjD2 fW+YoJ5IISdO9+fPUcpBbPnB2TLundL3EMxf7/b2KeONk7yiOZEAVvdqvaRYJHUBtP6etP wb2KrsQ3XJp4XJaGnsZlNhvWNaKVmt5FGM+CEq0fc10/VHe2OeIcbYNdtg0aBw== 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=1701819618; 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=zGkAv4Hht4Ssqg6FFLzLQvPkmOqsdLQdHybqw1u13M0=; b=MJENBVblRlyrVnz88cVXEJ1bGxlbaUB+X70z59anDGBq81EmswnaFcrncaN2N4mR5jVLgM Re2qJm10kVlzCztrWAEUAsaQEJ9WSSkUY6IF0l/bUhJYgpoQCd0ntDNx9NL0auwhy3GHsx hd0zy5lJh5euoCUvaUvT/BhPTslCYqWz22GWTQhvebQvtgX/8I7Gcg79u8sy3sVe8x4XlL 7lm9mGHd40l8oqDUZ6TGS7y1ZCVA95dF67pD4R55hgogZ5SzscnYFZheYPiu6L74QHbHXP TatUK0wNFTBS5ZGKsGQysrZv7be6arl2m5ZR/BpE/wf26osgkWdOxGUa5yCpHg== 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 4SlH8K6xWmzWJF; Tue, 5 Dec 2023 23:40:17 +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 3B5NeHBX037947; Tue, 5 Dec 2023 23:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5NeHG2037929; Tue, 5 Dec 2023 23:40:17 GMT (envelope-from git) Date: Tue, 5 Dec 2023 23:40:17 GMT Message-Id: <202312052340.3B5NeHG2037929@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: 9b92ce7bd3a3 - stable/14 - Makefile.vm: Fix duplicate rc.conf files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 9b92ce7bd3a3cd4f127628a09bd4a9e9fdffe18a Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9b92ce7bd3a3cd4f127628a09bd4a9e9fdffe18a commit 9b92ce7bd3a3cd4f127628a09bd4a9e9fdffe18a Author: Colin Percival AuthorDate: 2023-11-27 21:29:05 +0000 Commit: Colin Percival CommitDate: 2023-12-05 23:40:05 +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 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