From nobody Wed Apr 23 04:43:57 2025 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 4Zj6261ktRz5skLs; Wed, 23 Apr 2025 04:43:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zj6256Jq8z3ZrY; Wed, 23 Apr 2025 04:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745383437; 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=/I1cRq832e1kLKxpZAEj5Ui/Sm5PM8dGU6C5vggCyYI=; b=Ew+HQ/tBZM2dDlWl+dwXOjy8uipAVuK/1+fc5YyemvQRSoA3xJ8W4ggnZ8V+Q85Dxz1tby x2PDQELh2kNhqUgjVLj/NK/gpZBhiWDqHyy34jEFGV5FFmAYPyK7lQKbr5UOHfR32/R1i9 m+utGkJOrx1/dPJFVtOdI7VXi5IeStZ67X+fpc0wqSUO4y6JxKUpvFRr1cibwKNexFO0p4 61r/hTIO4QuAI4QxSJD3GhI80MZJofKB0LlJaPt+YwbcGKF0KjnuBiAdbVRToCs32+ELPf YC4ZPhSy7hoXLXDg6Y0yuvf3JjTtKaQJwpw96i6aX4eSPFL8t0CV378cxtY1iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745383437; a=rsa-sha256; cv=none; b=J2XRQhX2wgLYuNEGA53ak9UROWJ4zDHHHhNLSJLFHz9fBUAecoyX+P4msp1OVdejrq4xPI x0V66Q4w1pXgxzobyNlZveVpvMgN3SFTjTRuq/VmflYRs0i/IJbdQPTtOpQfJLtjxTobZo t9J44DipUImIvInc/BHm+WF4lQPT9SfT2QK1luEj7/lKCy+Qd/nxKXn0cE6yF7TNp4sDin YSmqaC/OWcOoIjA2JWKKY1T/Nl8EP0whciwwOCgtAoER2ZxxkUAKIgLMJxhTxHzkXkPNZO lRv4y/FQBiosPai08RtvQ4bk3jpdTXFbJIPFrE++AstyNFPmTQHs3rqf/9qKPA== 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=1745383437; 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=/I1cRq832e1kLKxpZAEj5Ui/Sm5PM8dGU6C5vggCyYI=; b=NhLSFKo0eFD5rozbLZCk9sF2fDZPp5nF9LJhRzJV6qThOySE+jUkM/zffkqlHFd9XAYjdk Gy27w7faV5tTPR4wsSSxr9aP1V7G7hPK26sFAh3j1/0baxjdTaSXNTLty8Xm22G0JweIdX cSHKuS7uwkKMCiT402t/ewCQVYbZuZbReqVlmgLlWauYhhmgPNLr23ka0+fGz68F3c2jKZ ntanb8PB4+IcmMNjQm0CAARTUzRVDhVX3MFHGfw8ohRPIPd5Vz4yz7h9Oh72OI41iU9n2O wudRP0UqWjoN0AYbqnvF8mQun2cNvd7nOFHt/WM92pfU3Fi5JDaz8kzMcGpmwg== 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 4Zj6255vQyzqJ6; Wed, 23 Apr 2025 04:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53N4hvLr070594; Wed, 23 Apr 2025 04:43:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53N4hvED070591; Wed, 23 Apr 2025 04:43:57 GMT (envelope-from git) Date: Wed, 23 Apr 2025 04:43:57 GMT Message-Id: <202504230443.53N4hvED070591@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: d14036ea424d - main - release: Pass PKG_INSTALL_EPOCH (take 2) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d14036ea424d5aa3eee20cc6f0b5d7117cc3931b Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d14036ea424d5aa3eee20cc6f0b5d7117cc3931b commit d14036ea424d5aa3eee20cc6f0b5d7117cc3931b Author: Colin Percival AuthorDate: 2025-04-23 04:39:56 +0000 Commit: Colin Percival CommitDate: 2025-04-23 04:41:39 +0000 release: Pass PKG_INSTALL_EPOCH (take 2) We need to pass this to cloudware builds, not just VM builds. MFC after: 4 days Fixes: 81ca663642ef ("release: Pass PKG_INSTALL_EPOCH to vmimage.subr") Sponsored by: Amazon --- release/Makefile.vm | 1 + 1 file changed, 1 insertion(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index 7821109cf9ca..ff8adcb8bd9b 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -138,6 +138,7 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} EC2BASEIMG=${.OBJDIR}/${EC2-BASE${_FS:tu}${_FMT:tu}IMAGE} \ ${WITHOUT_QEMU:DWITHOUT_QEMU=true} \ ${NO_ROOT:DNO_ROOT=true} \ + PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ -F ${"${_CW:MEC2-BUILDER}" != "":?ufs:${_FS}} \