From nobody Thu Jan 23 13:59:00 2025 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 4Yf2c46cN7z5l0Bd; Thu, 23 Jan 2025 13:59:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yf2c45Cknz3bpl; Thu, 23 Jan 2025 13:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737640740; 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=5ogGd4XLCsydAEGo3nnchpdMcaLP9vzELWslOYsf7yI=; b=M26YZ3Mth3WJI8RsqUWJ/r4WChrwcL0b5YhPrHzxekW4YeK8w1IeINR8e2FrWifFTMlJOe 92Le+umZsHsxdmP/OPjNP4lIe+2JZYhEsDIrhWFd8NxH70X4L/xxBjtqNNvvp8iDdO4FDU GUsXtVIQ1y9rNxTIhXiQ2bSxwcFPdK4jSfZTwWOurqoI+j0yUmjnxlusgeL1Rbjm9OGrN7 MRSvFq967V+9DauLfNMTakAqi/s4qxfZhnYc+jUEsNbV7uvGyywDmWWrS34qZTILeUfWTx NgGF2OuPiyjGCGmT3xPM+hBI+7qc0VG2fk6O+vbZ8Bfl2K5iSKJ+YXli+PIegw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737640740; 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=5ogGd4XLCsydAEGo3nnchpdMcaLP9vzELWslOYsf7yI=; b=P5FFaUIhIchyZjQC1bKCvp1VJkF9404b5Wk8bZBExN1/xUENTqPDOTkAZdWluEIh1F18Iu GWwRkBWxE2CdhTTfR4LMlx+UJsbIKgh56UQomDh5Zj0WTh7/8Yt+S9bTPIOMKN00AnutQh 1DMYhzaUk/hnucqHNB4WQgeJvJTespvDjhou0cgntm4VOqqeogXMme0qXgPJo8dJOu8gJt 0/el2BBYSEL1kx9+omrOBM2m1/jmWFiykCnZC5865mpRLnVHJg6M2Q9Lh739rHKoqctM2g B+pcUtuFCG7f1cC751i8J0Dv/aU93nu95fTMD0QB4EYvPeq58LSzQg9sIsJ4Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737640740; a=rsa-sha256; cv=none; b=McNxCoGA9DYEh7tJNWen3mi30GtyFCfkw8VEMuImZwQpOwlQAa9LovgYGH1Gz3ui2O+dZf Uj78Ru1YHLCn8v8x9CjI3cW6xWXtcZywPVp7IuKwPCma6MyGjArCPhcRNaimI1K7qCxsJX xk4M0SCCUIFSfzzztOxhQ9chvBOv/V1hOiYMYcWGSTrHDhR9gOzF9D4K80LufKGBmrIBYO d7DWr4akGc4wUD0HVqnChibrGymzGjrxLRImiFF4zYLdxmttkyfPgbgThdNIR7zZPtqnVe ZeCkXPuhaKwCZ4IeXoAjrtLNLCFahrP9RsnaBmgA0g75kyXd6xe7LATibmRyEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yf2c43jGXzj6G; Thu, 23 Jan 2025 13:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50NDx0BY026480; Thu, 23 Jan 2025 13:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NDx0Zl026476; Thu, 23 Jan 2025 13:59:00 GMT (envelope-from git) Date: Thu, 23 Jan 2025 13:59:00 GMT Message-Id: <202501231359.50NDx0Zl026476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7b95d2a40219 - stable/13 - pkgbase: Fix OSVERSION specification when creating a repo 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b95d2a40219ddaf187dbc087e1f9a0615b70b60 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7b95d2a40219ddaf187dbc087e1f9a0615b70b60 commit 7b95d2a40219ddaf187dbc087e1f9a0615b70b60 Author: Mark Johnston AuthorDate: 2025-01-19 23:25:09 +0000 Commit: Mark Johnston CommitDate: 2025-01-23 13:58:36 +0000 pkgbase: Fix OSVERSION specification when creating a repo -o OSVERSION= needs to appear before the "repo" verb, otherwise it has no effect. In this case, recent pkg-devel fails to create the repo, saying that ABI cannot be specified without OSVERSION. Reviewed by: kevans, manu MFC after: 2 weeks Fixes: 188fe88ec50e ("pkgbase: force OSVERSION") Differential Revision: https://reviews.freebsd.org/D48518 (cherry picked from commit f9097705fb1c8d9c1f8946d1c1897d606bdbd517) --- Makefile.inc1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c8b5fc856dd5..65a5aa203aa3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2150,8 +2150,7 @@ sign-packages: _pkgbootstrap .PHONY .endif @[ -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="${SRCRELDATE}" \ + ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o OSVERSION="${SRCRELDATE}" repo \ -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} \