From nobody Thu Dec 07 07:48:12 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 4Sm5ws0hjVz53nXp; Thu, 7 Dec 2023 07:48:13 +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 4Sm5ws09Xpz4JR0; Thu, 7 Dec 2023 07:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701935293; 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=riq+e//OQXkHxcXRfb3P9Rx4SFfmVs8Wq4/Exp/JKDc=; b=p1Gv3TcRpvqmkZXu8Oawga31pFl3MuzzDcHCLomANmKqNgKCzprX0e6cmYt1k3g7uqhXJj tUycmIccrJbuVPp5MUa6+lRRUiRwiHQJ95pmakjnomMjsK0mo0QVK6r7MZW5cPVUhvMe2k 3l6C/jgHYIAK+ONcj3ZiepKkElcr/dnxnDkjX1EKPqe2aBRxb/VNxgSv7KCuvBZs1Kjzsa tL8hQegoV1d1EvFKyUN3Vq9s+N4U4+5L6rfQXupGly4UPqJxDW1dRhbbqxAX5h1acTdqNh DsaA3HmcH+NFyZm3orJI7510MvFF6Eu/4uqNIz4fIgrh/IWEBImcACo7wizvbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701935293; a=rsa-sha256; cv=none; b=w5Zxy9BoLff+hySugtX89JnEz4CQafXVeL9NsfFoSc6cxojidJVOrusMFmzT3uHlz/kTlH DwZU8CYMIVp2mD9NZ4XDNkhoH6BarCD/ySbmwI3cM6MFJbK0JKn1IE91udDF3VhpTPV5qB xU16glrXB4Cfi3zCA7TsYgx4J9aaAVdq4ZzzT69E9BUteJKppKJtZGiHU4lAeymtvPeBP8 ire+eS/SEE3lkuepCch/TLzJWpjJRuoROgk65acK4HayQftmjDh3nxJiYcEw1jtAAV+NYd G2O45MH5EiEOxFBqHYZVK6CL0RxnkOL/4NQI7UPMcTxdQ6tH8NyNdfdkgoFI6Q== 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=1701935293; 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=riq+e//OQXkHxcXRfb3P9Rx4SFfmVs8Wq4/Exp/JKDc=; b=YrNpUSOPRf7Suge1DxWbWB/B8H0XSXY8Qh4Ba9nRGq7OQt12R20zsmddHZ2BhxL4zR8Hgv GiSrC1fIvhQsm2jkTCbhZgJmeASLLR/y8ORPmvedqCh9vvCMR52LfMv2H6BHAf+foMzui6 YLnvve/w3tMlioyX39RqmcHS4KdIhxnDMCtdZL+lx2l2mQ0r7FWDboIxGEJaDT78eR123K B520OJjLxwf13mxyE98m8DCX34bQGWQdDl9G2b7Pwf1IX4CH3lBWaElCGRTXoaF7O6BDSB AaZQk4CDYfqb2yTNzmmaX53ZwZfNzxkUOsJqjzPNSyDoUw6AYKcMRmRWP1ZLPQ== 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 4Sm5wr5zVHzDGG; Thu, 7 Dec 2023 07:48:12 +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 3B77mC8V063766; Thu, 7 Dec 2023 07:48:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B77mCkB063764; Thu, 7 Dec 2023 07:48:12 GMT (envelope-from git) Date: Thu, 7 Dec 2023 07:48:12 GMT Message-Id: <202312070748.3B77mCkB063764@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: 44600eb7e231 - stable/14 - pkgbase: propagate SRCRELDATE to the packages correctly 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/14 X-Git-Reftype: branch X-Git-Commit: 44600eb7e231b0cc6c36d10031d983051cd683ee Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=44600eb7e231b0cc6c36d10031d983051cd683ee commit 44600eb7e231b0cc6c36d10031d983051cd683ee Author: Baptiste Daroussin AuthorDate: 2023-12-04 08:22:02 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-07 07:48:00 +0000 pkgbase: propagate SRCRELDATE to the packages correctly MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42892 (cherry picked from commit 5faaa602cee093269b1a73156c95c6892b4f098d) --- Makefile.inc1 | 12 ++++++++++-- release/scripts/make-pkg-package.sh | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 199a0f2ef0ee..ffd0b14ce87d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2012,6 +2012,7 @@ package-pkg: .PHONY env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \ PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} \ WSTAGEDIR=${WSTAGEDIR} \ + OSVERSION="${SRCRELDATE}" \ sh ${.CURDIR}/release/scripts/make-pkg-package.sh real-packages: stage-packages create-packages sign-packages .PHONY @@ -2107,12 +2108,16 @@ create-source-packages: _pkgbootstrap .PHONY -e "s|%PKG_WWW%|${PKG_WWW}|" \ ${SRCDIR}/release/packages/src-sys.ucl \ > ${SSTAGEDIR}/src-sys.ucl - ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + ${PKG_CMD} -o ABI=${PKG_ABI} \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ -M ${SSTAGEDIR}/src.ucl \ -p ${SSTAGEDIR}/src.plist \ -r ${SRCDIR} \ -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} - ${PKG_CMD} -o ABI=${PKG_ABI} create -f ${PKG_FORMAT} \ + ${PKG_CMD} -o ABI=${PKG_ABI} \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ -M ${SSTAGEDIR}/src-sys.ucl \ -p ${SSTAGEDIR}/src-sys.plist \ -r ${SRCDIR} \ @@ -2152,6 +2157,7 @@ create-world-package-${pkgname}: .PHONY sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \ fi ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} -M ${WSTAGEDIR}/${pkgname}.ucl \ -p ${WSTAGEDIR}/${pkgname}.plist \ -r ${WSTAGEDIR} \ @@ -2187,6 +2193,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap /version/ {print $$2; next } ' \ ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} \ -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \ -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \ @@ -2223,6 +2230,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne /version/ {print $$2; next } ' \ ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} \ -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \ -p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \ diff --git a/release/scripts/make-pkg-package.sh b/release/scripts/make-pkg-package.sh index 25ec08f71fe6..68172c47f326 100755 --- a/release/scripts/make-pkg-package.sh +++ b/release/scripts/make-pkg-package.sh @@ -9,6 +9,7 @@ export WSTAGEDIR=${WSTAGEDIR} export REPODIR=${REPODIR} export PKG_CMD=${PKG_CMD} export PKG_VERSION=${PKG_VERSION} +export OSVERSION=${OSVERSION} export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg -V WRKDIR) make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \