From nobody Mon Jun 16 17:16:45 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 4bLc9n4gNVz5y8YM; Mon, 16 Jun 2025 17:16:45 +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 4bLc9n2mWbz3TDp; Mon, 16 Jun 2025 17:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750094205; 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=OdDQOZPiMVXCWoWrUuXLKXasBP45VdD4WmjgLSvJlmM=; b=uFQURb9L05v/8AXyHT3tlSTifoN1qZMY+dkBFaWZFBgHd/zEoK1TS2uXPEZXCM4j685OKP q3HGrbGe0m0kRvOBdiIFKzJijqzNMwUFl2bvuj6bgKZGBd1hLqvQXIdC2Yw+Zz6nbB7hrc bSIetnGq/EIA8RMXQfvnlPr8vgtAnDC9mLp0fu6kRC26K1cKh4uHeOtYHRHskQ2AyaxNBL UzMs/25XHwYuMoC/NGDIjZUgh94nZNwEK7+71z3RSUJy42MNHPHCgZ2VxYZ3imblG4wB4T wUAdM/WuhFlE5mcL4UNj7gAEoqeb1PISTUnCUfBHyryh85+VrX3kJ+S42VyW+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750094205; 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=OdDQOZPiMVXCWoWrUuXLKXasBP45VdD4WmjgLSvJlmM=; b=iLPlWBrnrNlKJBVqdBpATBSJuHbQlBNra7S49x5k1FcmvxdhE4zLsLplrgcF28oowLSSyL bNPyOKDiph3toKvjzDEiIjugbi7UQmocBl1xbvDd1ZY7PWQZR4zun29zQB0qqS22tSZVYW Y28X8yXQNYe4dIK7iiHk6LrDFeeX+z7Zr07rUxn2cWi+b+iexBpI2XvcPQCNZDFAMhyHhx FDlMo9Gl7YS1ysZw8q5gJbAA0HCDbePcRuBnp/DxK8RZazuY/Eh08g/EP2GCvgAa/QOAcZ 5Mzc5OCBkWFfT14MRR8ZeuZW63Y7jRWbnucPbyHWZBWghiMRbP6jDZfqcyOGKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750094205; a=rsa-sha256; cv=none; b=Nx1AOe5WJFAZME8RD/UOjCS8ZS9ZDjx76K3bmEgcKV4Wm0YwVjYIqgPTWxnyGboFB2FZQa BPt/hz+8Qx8dYij+HEbQE0xx4JUXE2KNMFQ9SbjMZXOy/ep0rpkRldZS43iuI0FKLsY1Pe V4M81UE9CfLK4ZUwUJloEDpPtSfdFRs7nFGaxvGaY5PIJXeB7kfpdJdYQPJXTplBBm0tZd vg5klSW8VTSw4CPSOFXGE3W5+rkUIBjTSmw5FBv6t1qmtcMnabB1mKsWxBUNt/64LSMvLa b57hzrOV0ST37P+nkI5cEbdY9wC5xBUFTpr9k46tPaUiTYyHvWheQ8SE3vERmg== 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 4bLc9n2GQHz16BQ; Mon, 16 Jun 2025 17:16:45 +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 55GHGjRE085445; Mon, 16 Jun 2025 17:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GHGjlb085440; Mon, 16 Jun 2025 17:16:45 GMT (envelope-from git) Date: Mon, 16 Jun 2025 17:16:45 GMT Message-Id: <202506161716.55GHGjlb085440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e4988ba172a8 - main - Revert "Makefile.inc1: allow real-update-packages to be called independently" 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4988ba172a84b35abab8ce065f2210dab70f148 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e4988ba172a84b35abab8ce065f2210dab70f148 commit e4988ba172a84b35abab8ce065f2210dab70f148 Author: Warner Losh AuthorDate: 2025-06-16 17:14:36 +0000 Commit: Warner Losh CommitDate: 2025-06-16 17:14:36 +0000 Revert "Makefile.inc1: allow real-update-packages to be called independently" Revert b44147bb1245. It doesn't work right since it doesn't bootstrap things quite right. It doesn't look trivial to fix, so revert until a proper solution is done (though maybe that solution is just do `make update-packages` and not document/support these other targets). Suggested by: bapt, emaste Sponsored by: Netflix --- Makefile.inc1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 97bd81f3263f..ea498a8afae4 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2035,8 +2035,8 @@ PKGMAKEARGS+= PKG_VERSION=${PKG_VERSION} \ packages: .PHONY ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-packages -update-packages: stage-packages .PHONY - ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} create-packages real-update-packages +update-packages: .PHONY + ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages package-pkg: .PHONY rm -rf /tmp/ports.${TARGET} || : @@ -2048,7 +2048,8 @@ package-pkg: .PHONY real-packages: stage-packages create-packages sign-packages .PHONY -real-update-packages: .PHONY +real-update-packages: stage-packages .PHONY + ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages .if defined(PKG_VERSION_FROM_DIR) @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \