From nobody Sat Dec 02 09:45:35 2023 X-Original-To: dev-commits-src-all@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 4Sj4mc0BJpz52hW6; Sat, 2 Dec 2023 09:45:36 +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 4Sj4mb2h85z3YYD; Sat, 2 Dec 2023 09:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510335; 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=zTYiWWwWnUDBVdGdtpI5DhIc0u5AE+/XS2sZwQBRGCs=; b=xy18DDXrEFzT++FTV+/JRDPq1W+UZqlxl8ryVCM/RzQqgY5pTJXsQO3tov9Drp84ws+h+I tEjlmhrd5zqd32bCTKGqid+BYf4toFgHNSQU1l36QkrieU4t6UycxSv52zrxtENbq9pped HB1Ik0Roj8SW+vgtQHer1g/Waecg9HZWYOi7HqtaF/EVefGwSJqYs9w8Uy57NiW6U+sAZK xp3/t4/LS7wfCid+iYLsBG4Yi2Fi9sGfdPyQnOBkW4Eo6ZSNGF3uHKFv9Jrj2v3OkVjVMm Ng+LnCKn5w3j0w4llqkLGf+LC5oiXT8bxJX/uJr8SNly2yHBuWnfdF9CI7Gv9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510335; 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=zTYiWWwWnUDBVdGdtpI5DhIc0u5AE+/XS2sZwQBRGCs=; b=tHZAn0+EVHKPY44kF6BKNWKtGazLroGg/SSToYaqTzoBblhjC1Vb8Xn7wHwKM9DBO4D1Z5 6fQX33tpTWGJ1ch3+uRGNEVI+oaFomSvAwttQPM6JZPx2c5eEy2UPHKxsdBw/X7rKpcJb1 r/TUBH6nt/P9yo52ZonN+XqbIrQPSioDiBj19WzQcCGkS13dZqEOjmXRKmYz5HVhNBB20u YnSuhQ91byL8bUVa10KUi35Omov6n07Y6MN3cbdIYTnU6uyc6OE1wxtlcmARXK8ZC7TY8L FdfKsiOqzK35yRLhdSokva5brtPGAW2X7sSPEIvUj09Zd28cxnB5qbgphWT6aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701510335; a=rsa-sha256; cv=none; b=wokJ4alglHn0/4pgrBZzce2eLu2gTrY5qXpnfYbrUiV/dYHic1PvQPhqEw3eC/Yvbh4ip2 eYuvkmv4+Qufos9VGi/Y4u0eyG+1L13ZEtzxZYrzUMLgDDhdQMFUlfH6MR8noGeAsV6R3w SW7j5rrRgMVU54eoawzuRiz9NhDS2xSp3HCnjy6ZxxFshxigQLJMwDlbBGy+zs+/bxsEIT QgCZgPhXAnyftRSvs5QA2RIjA8FDxw1sAjXD8W3Pne5gq8UN/lSlXb/hWnij4/34U4164V h/6b70mGK0poJkB/pfXAYqZ+4A8+l1iA1VEGSuImIbV4yjJ5yS4aiVUbDi/d3w== 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 4Sj4mb1pRQz1B2N; Sat, 2 Dec 2023 09:45:35 +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 3B29jZK4011608; Sat, 2 Dec 2023 09:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B29jZgx011605; Sat, 2 Dec 2023 09:45:35 GMT (envelope-from git) Date: Sat, 2 Dec 2023 09:45:35 GMT Message-Id: <202312020945.3B29jZgx011605@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: a3b809c0c815 - stable/14 - pkgbase: create package with SRCRELDATE not OSRELDATE as OSVERSION List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a3b809c0c81590b05a145db99e98426418a2420b Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a3b809c0c81590b05a145db99e98426418a2420b commit a3b809c0c81590b05a145db99e98426418a2420b Author: Baptiste Daroussin AuthorDate: 2023-11-14 07:41:47 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-02 09:45:01 +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 67fe06aa1135..b73b464be2a9 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2193,7 +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}" \ + -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} \