From nobody Mon Dec 04 10:39:36 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 4SkKt10VT9z53CjQ; Mon, 4 Dec 2023 10:39:37 +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 4SkKt073Jlz4S5B; Mon, 4 Dec 2023 10:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686377; 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=dkM3MaMJWPCSPiGAkr5P7dDQk5J7cO3wGFE9NJCVFmI=; b=tXvnZSYWYhMNofTwlbv/VUawdtYq0AI0xDzpb5wMUZbaQNO/nnn5we7rQOzcv67dVAMK8O pMGalCwazlTM9Fx1Z3HDfGtquAnxM6OuTVglnegzTX+V1UfybLYCXkuIhyYIlN6Ar9z8/X gM9VlTXBD9BC3DNpN96APcQyZJJpqiz86S90XQCCItD6WVrPNT5al7FjSt5wSNO/Gczg/S X2YmsHCMx3+UTCmc57JoTov2vG2nc33j68FHK/N3S4tyt9Iefe8prHPvEqNcw3LmbIUyTy U0PqzNiJ/8P+XnBir2le/qBfl3ISxm0+fOv8mljhIte8rithgotiwtOkEwBMew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686377; 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=dkM3MaMJWPCSPiGAkr5P7dDQk5J7cO3wGFE9NJCVFmI=; b=bso6EstSuyt1F3U+y7ThnmahkslU9EYnn2VsVG7WtelQkmBw3Evf6RZzpoCs1UpUwXRI5O MB/I7hSu/w64J0f3iPfCGFfG6nAcabBIY+3R65xpJA87m5m34+/3t48THWXLFcwCPaBzbi Aal5xOxYw4FvhaHTdoUYuSK9o7rlGVQgh8zBBEce4M1QlnbdKy38C5ND+DRYF7nfCjdVck Ze1BtK+wiUI9jHAwaETsIxaJ/d2NbYSBzTp6krYLUSEf76SLbGzgCYSJIK9aBoJtJdNpSg 7Y5Y63T8FlWibKkrfj/StcZlleu4qtjMfPEFQ5ItERa26d0saJU0WOZuutRlMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686377; a=rsa-sha256; cv=none; b=KZNqaPgWApMgnHrI0fhxuYJUI5VkTei8w5bGbA77iLM4KhnBrw7A1AdkZkP2DeGOmtlM7H Pl4WSwod2nC+hN8vys7mAKfT9c6Uk//O+tcah0oML0HKHU7wtigJzXEkXvPy3W8CaXjmmx daRVULe3d3jazlyrp/Fy42vLSqQuxOEzb02NX/dES6WcPT28OQL2Xs+uvggX/6mxmxiXzb DQMBYY+bs9G2u5kMcgLQkWFULuSvQlqk21Ezr0doqWGnY4F2SbQE5EIKLi9hRmhTfrdsBi hH+4iXrW+vNcmFgpT1fZDGmf7bKpFN5V7J/w+9EiUmZe7AV09JGZosoALGSIkg== 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 4SkKt068LWz7mk; Mon, 4 Dec 2023 10:39:36 +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 3B4Adafh010198; Mon, 4 Dec 2023 10:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdaU2010195; Mon, 4 Dec 2023 10:39:36 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:36 GMT Message-Id: <202312041039.3B4AdaU2010195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ee89da102bf0 - stable/13 - 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ee89da102bf020a2289d5b5e618c421098cba1b9 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ee89da102bf020a2289d5b5e618c421098cba1b9 commit ee89da102bf020a2289d5b5e618c421098cba1b9 Author: Baptiste Daroussin AuthorDate: 2023-11-03 08:29:23 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:38:33 +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 ccd65be4402f..ba842b7769a6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2139,6 +2139,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} \