From nobody Mon Dec 4 21:28:47 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 4SkcH36wyvz52qpB; Mon, 4 Dec 2023 21:28:47 +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 4SkcH36McVz4Hx2; Mon, 4 Dec 2023 21:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701725327; 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=RRFcjxS3rT0pT7ToRaLMpQZOUrMGQHJljjqWuzZ9jZs=; b=M7XuxytfWrfNNtYe7xER+Nak/rqnqx4nQU/T+Bu8Fxe3RomdPckxqLLOI/7BfzxCz2CRjl kGHEeHa6v9pjkiR8OgHjGMWJ+J/v75W0VOiPOS/YicwZ88yC+5FvCzqvy04Xlcao5XPGRo vheFu6kAkCqwqa3SDm1Xway/bS7BNN/GY7YNk5Osk52Xg/mGwkWuntHg8S/+uGbMsnA1sr AfN7qyOxLBE10syR9EXfivT/XWqpHkM9dAEee/OBNpwpPgtYDCwMU5+z8yxh9twnj+N8lE 1F6UESDP7T4hbzq/ovkwxLhT7BKyjhv8hLDssMNX7DhD0EZsT9y+mPwgLsXIqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701725327; 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=RRFcjxS3rT0pT7ToRaLMpQZOUrMGQHJljjqWuzZ9jZs=; b=TXUsgNv0k+AuqzquIvLkp+54/wxMWz711E4t2yNXgHNZTmpp83s1GkmoH7oLI26jx43soJ vkKFD+PRtfOouVRoGJlE3RgodjeXBv/95MyNt/a/RCivdqCNGYCyRo10z4CbR5qwzlyS10 5oejPWGB9j/Oyfu75ygOJmMmGukg7pbuA56DzfP16HvxczH/w2hEWflRZGEl0rBA195vdA 6r3o+bO9nG8OWjVyi/xfCxV2i5mkjLs9D988L+sdxsDYSIBOWfy7v+D6hPUraHFISe2Mrz CLl+4qL1h9NBkn56poF22cQaIyzw4ZMouslkz4xQfZ0JBgzg3mtXP25d8LwZJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701725327; a=rsa-sha256; cv=none; b=E0891L248sInzbdGMA6KBPvbdGeIz7XVOwEmpUlf9364XJJ4PUUWocqXNJ9o5+G8mFv6d4 GIOl1qQCa8p/oR8MjPGRw3TUrRatoWbdXmr24VUz59m/MoN5w6vc4j2M+nLIgPLbUdPVLA FsE3kxIqMeMeKaEM2MbUPnLT0M0zEOfjgDvSzZ3VIjTqnB60uJ/YJk6mLqBAnfxoSqqABw OfhsXSV2eau7K7tM4KFSnRbaYNCUe+b56kY/foslHROUqFftKLcy6LBG3WDVllniAKhhSQ +Ejjm+bBtkU8tXvYvtkBkFgh3tGW1F2RG3HhEloqXysY3M0/GPFl0zokqHC2DQ== 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 4SkcH35RY3zjHx; Mon, 4 Dec 2023 21:28:47 +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 3B4LSlQX095623; Mon, 4 Dec 2023 21:28:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4LSlm5095620; Mon, 4 Dec 2023 21:28:47 GMT (envelope-from git) Date: Mon, 4 Dec 2023 21:28:47 GMT Message-Id: <202312042128.3B4LSlm5095620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5faaa602cee0 - main - pkgbase: propagate SRCRELDATE to the packages correctly 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5faaa602cee093269b1a73156c95c6892b4f098d Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5faaa602cee093269b1a73156c95c6892b4f098d commit 5faaa602cee093269b1a73156c95c6892b4f098d Author: Baptiste Daroussin AuthorDate: 2023-12-04 08:22:02 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 21:27:57 +0000 pkgbase: propagate SRCRELDATE to the packages correctly MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42892 --- 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 0698a5d79a0a..d85e6fd8f15b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2013,6 +2013,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 @@ -2108,12 +2109,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} \ @@ -2153,6 +2158,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} \ @@ -2188,6 +2194,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 \ @@ -2224,6 +2231,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} \