From nobody Sat Apr 26 19:50:08 2025 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 4ZlL0J6Bwkz5tgmX; Sat, 26 Apr 2025 19:50:08 +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 4ZlL0J4B2nz3JRk; Sat, 26 Apr 2025 19:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745697008; 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=zDNLYftvjl1IvbE3lnL+7RBUbs1uow0kNvEGWbXeod0=; b=i8acCLH59OoJxzHTu8hhArdzoHpomSEnEdPOqRr4qLgNg28lieRR0UeMLW7gWNTGnz8kYc tI1oiceSXIrYP4bRuz1tpNaMMTobT0oQyD+CEcWLSN+N1nJ6HPPrQXZ1YI7CM+JcmFUpGA XXol2EMqg/JPy4QE95oyRVbrE7RhIUiYoGmiMpiayK175q0KbiRwWXhlNnvnakYT6LLLPC 6Kd14Bf5katDlkznDy14NYmwQtinTKWaxkijHmTCLO33mS/H4ZYACW0wiEMUOWqhP32glF +T2X4wUBUUJUaJOkqrMF6/Xk0l8pUQ8m1s3Vn0PWvNF80CbFg9vDF8xPOiQSTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745697008; a=rsa-sha256; cv=none; b=TXjdryrj8R3TRthR+V/ItjO/fGbWbx6+ZNGeqppwxoGJMMvHIiaqELFogdGXXXVeFpVk7/ UPWv9voq9IFZvI+NY2I79puAP8D9r+zW+8k2yfIpNqGfA/kc81t3Jab0Sej03Z+Y1dRKmk xIZgWvyOxmVX/jqTolB4Hu+PeaIDfhBnOKC3dxWVLctDobB3ExVXs/zLeUSjF3TUsLOrhk p1dQDxPgbOtYnGS0fKrz2V1d/Fm66SyQYOWtzebsH3wYSet/j4mBsZ/Xs6eWG3UwkPaxWA Z0brUSyWLW61G5T2zUNblNIRSCsIjAJ8NoeayPydgT3rbcP3z/RIzRyZjGxYQg== 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=1745697008; 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=zDNLYftvjl1IvbE3lnL+7RBUbs1uow0kNvEGWbXeod0=; b=SrOv3uH/LCDI4123ZrrT1ulv07BK/T82ZhS4MlAkC4nRloThFWSHAg50K732ycuaXDhbVX 7LohhSwkuBgfg7OKbzV+JHKjRlRtEhCB1+tIJZ5PwkmkLBhKIb+38RgkHfiVxr2IE3FPeo s8LCoWeA2iI/L/0OTeUOmNKd2oZZ6SIMj24WHVzItMTL3GgQ00SB83TgeK0jhlvThYOWn0 iEW8G7bTc+twcthStrgKcyp87P2IKaNgjtjQZzHam3aCucvtXN67Md508Y9dqrPdOm0g/f SCf6tWuPuav+Aqbwy/vrffwL+rlf4Li2t38J5DwHJNfyXMiSiN/P9OqNRKz5Dg== 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 4ZlL0J3PF0zbKC; Sat, 26 Apr 2025 19:50:08 +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 53QJo83g056960; Sat, 26 Apr 2025 19:50:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53QJo8t0056957; Sat, 26 Apr 2025 19:50:08 GMT (envelope-from git) Date: Sat, 26 Apr 2025 19:50:08 GMT Message-Id: <202504261950.53QJo8t0056957@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: 2ef9c17d68c4 - stable/13 - release: Pass PKG_INSTALL_EPOCH (take 2) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 2ef9c17d68c491064bd00d68f3d417581128b9f3 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2ef9c17d68c491064bd00d68f3d417581128b9f3 commit 2ef9c17d68c491064bd00d68f3d417581128b9f3 Author: Colin Percival AuthorDate: 2025-04-23 04:39:56 +0000 Commit: Colin Percival CommitDate: 2025-04-26 19:49:35 +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 (cherry picked from commit d14036ea424d5aa3eee20cc6f0b5d7117cc3931b) --- release/Makefile.vm | 1 + 1 file changed, 1 insertion(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index 7fd02abf7dc0..9441cba890bf 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -98,6 +98,7 @@ cw-${_CW:tl}: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ + PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ -i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW:tu}_FORMAT} \