From nobody Mon Dec 04 10:39:37 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 4SkKt21NkNz53CrT; Mon, 4 Dec 2023 10:39:38 +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 4SkKt20pd2z4RvX; Mon, 4 Dec 2023 10:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686378; 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=UHka3IO3K5gRXJMJ42LoXhn5bOBGeB3LsmXuQFJnLGU=; b=jeoePDLVr6HfMMuh7qXned//m5oZrfaqveYq9aFLMTDDBRx8Jb1QGgO9NbDw5gVg3sAFMe yEw2MCBUdk1+skxFErsNVVf9dCIapv8N1RL1lnGzuCvzu1M9RKzx8xGio3KpxBDdBCslt3 L3jBqXgr7sb/wvrkxhyT6QPFPFutFgPr1ahOch3N5Sh6j0A5uM7PSbjERX2IgiwNClfb3y rfhl51HmjVHtaHJBmKA2hvigYvTqhH0+Y4KK0mr7KlYUWyKKyDrMvmUsx+Ig9iFl3rGQt+ z6J0w/dIeC2FUHf/P3RUIm3z+R1Zv6BAaPhiW0zs1ioeWZQcD9NGBwm2Q9zutQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686378; 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=UHka3IO3K5gRXJMJ42LoXhn5bOBGeB3LsmXuQFJnLGU=; b=dGcDnZ6rqV6EgGIWIeqIU7vieOKS7DUJYsh6VCv5NnBiGk+70IMcTedo3Wd863TQOivVZC lUgehOYcieCcTBt3E9iV5k8GvehLn/aMkWp4YmfH0nVIjyNcSKweFy9/Jysx6S7p1+tTis NbxQMWelPzf9FaHouRMwo3dSgUTUOOTckK8iLLZFRxfc0DURU9Q6DjLkj10Tdb2w9hdx7t aC9aKX+uPK3uvX3Hj9k/LxjWl6P7XMngEDvBbUpTIcvhiLKh0fH+Scog3PxueXLfmU//iB r8+eHjmhACq6hMhz8KHmG8bPuHE9oUwP7OXHL8xTcbiSGFjzrx4Vzv9T3dBOiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686378; a=rsa-sha256; cv=none; b=t/3gVCFMB3lQk2BcJ63gPgtSxKQ5esND/0Xmqz/9cw0uq03GutEn0EqsZ1QGliumM3EcI4 Iuja+fIWULweb5b1+kDVgK1lcCyo7Jp6IaUBQrtbivyaqeOBqnMK80TTliTeIvY2PGFw5F QNDTiXjBV7+/U3G1q9FQSP80yAoAbuMLaIsk1aIvxHK+sTM1vxk1N5k1/ytXUeU/aF/jZ5 3B8nCHvBtTZudbLbyAXN46CtUzmrMaEyJJ5nd6Z/OA9d8niWq41mkEpUIOya/SaHEfnssy AsMlkJuwDXrGGt/LQQ3ulc5t6nXe1zZBYKPs4+qGRfdM9e3/JQ0gAdcmIjo2TA== 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 4SkKt1703Xz7pt; Mon, 4 Dec 2023 10:39:37 +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 3B4AdbWe010255; Mon, 4 Dec 2023 10:39:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4AdbAj010252; Mon, 4 Dec 2023 10:39:37 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:37 GMT Message-Id: <202312041039.3B4AdbAj010252@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: ff38a8c780d0 - stable/13 - pkgbase: create package with SRCRELDATE not OSRELDATE as 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: ff38a8c780d0fb16d1973f80211b268c5e2d2751 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ff38a8c780d0fb16d1973f80211b268c5e2d2751 commit ff38a8c780d0fb16d1973f80211b268c5e2d2751 Author: Baptiste Daroussin AuthorDate: 2023-11-14 07:41:47 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:38:33 +0000 pkgbase: create package with SRCRELDATE not OSRELDATE as OSVERSION In 188fe88ec50eac7c10e1d8350bf1180f8c16e463 OSVERSION has been set to OSRELDATE which is the RELDATE of the building OS while we wanted to use SRCRELDATE which is the RELDATE of the target system (cherry picked from commit 051d69d6f8b51dc1d7bba58af99be76185312222) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ba842b7769a6..423c5924d39c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2139,7 +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}" \ + -o OSVERSION="${SRCRELDATE}" \ -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} \