From nobody Sat Dec 02 09:45:34 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 4Sj4mZ3zJ4z52hdc; Sat, 2 Dec 2023 09:45:34 +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 4Sj4mZ1gtGz3YjP; Sat, 2 Dec 2023 09:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510334; 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=pTyVhc2Xw+nSZFj074bT1P3i34DTO2tOovZQotN3HpM=; b=fw2L2GFWYMBmBg47/M5bnhjaxxHuoVrohkPPvJbFfJy5VDdm5Ft2RvWKj4OaQZdBdnxBlJ 1MpaseawdYK3MAnFJVcqwbvRugrn5ucSlIQEcxH6PSMDHa2t3cqnkmkSVbEIDfrYC5ETph bwfkBwPWZHlY/QcIos3F26UscytXqCYQQu7cVSf/yYcQBlGpfE9jsVYv9dDSo2uRck2On/ dfOEJnpSfuAGrG+KypxvoAaY32ymmP2npZECirbwvTFukHboLRoPVkAUHhvuM8WGGJVY3N xxTtx3HzC2Nb4X6c5NyPCB2mU/5udP2d96zz+6JOMtKxODjgRV+fdI/mI9rSFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510334; 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=pTyVhc2Xw+nSZFj074bT1P3i34DTO2tOovZQotN3HpM=; b=U9KDk42CYT/emQCW7oIknSNbd4uAP6mJj+ls8AJ7OjTIOSJudh1Od5I12/p1N2akq1pVHR b+/M1MDDLFA3JrKF92DO8F9FitsXhGnmuVbE769nIe+1z4pk1YLtUFiRYFEIQBk7g77x1x NyCrmK9YDC9Yz3en0UmYi5Yhj6fF487N+N/mLo7EdTY7zNS0O/V1F1V5klc+0xEQs4Hk0/ fIFeHuTpI2RYeJ4+/tRPJYZn1dyaBSZ6+BqzJHNGUQG5cUeK8P+W1/Ngo92B4Mt24MzCqw ZLriBLEcjiAM3DwWKcSP/FISeQ3oqENWJ60VyeifuncYt1rZqPRFJqd9yzGXZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701510334; a=rsa-sha256; cv=none; b=cayM+3qNgqXEnth4QyQjBvyuxTRL0zSNAuxa6/XwEJZNNbJpXMR/rpbiiF3uOGuPgSgEul tCQ8AtM4JB1KEdQsqBlQNREYMUnxlEH6oYFWOqwuLrtDp7LcJNi40fy0Kmq5ZQjFn1g6RP 13bm+NPymGcwXP0Q4s87rlhgXzfNNHBijcnMMqDMctCMlyXzcPKfTaJmavXF7zHFupPhG9 F5Yaif5PZpkaVQAtohOKO018PX2GEDq8uiZgR+nNxFq3jiH1csrGJQ3XUBuByuglH8v7F4 F+hOdjh8WV028bx3ClASxbmUpLyARVQriSQiM0AumAUTRXEDN+ePztpHv+ChuA== 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 4Sj4mZ0kq4z1BK6; Sat, 2 Dec 2023 09:45:34 +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 3B29jYpC011554; Sat, 2 Dec 2023 09:45:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B29jY6G011551; Sat, 2 Dec 2023 09:45:34 GMT (envelope-from git) Date: Sat, 2 Dec 2023 09:45:34 GMT Message-Id: <202312020945.3B29jY6G011551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: a7fb33b94683 - stable/14 - pkgbase: force OSVERSION 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a7fb33b9468362416db157cdbcc1dbaa4665be2f Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a7fb33b9468362416db157cdbcc1dbaa4665be2f commit a7fb33b9468362416db157cdbcc1dbaa4665be2f Author: Baptiste Daroussin AuthorDate: 2023-11-03 08:29:23 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-02 09:44:59 +0000 pkgbase: force OSVERSION This is used to the package annotation helping pkg to know about backward compatibility is set to the version of the packages not the version of the host building the packages (cherry picked from commit 188fe88ec50eac7c10e1d8350bf1180f8c16e463) --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 7e62894405df..67fe06aa1135 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2193,6 +2193,7 @@ sign-packages: _pkgbootstrap .PHONY @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \ unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \ + -o OSVERSION="${OSRELDATE}" \ -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \