From nobody Fri Jun 13 01:21:45 2025 X-Original-To: dev-commits-src-main@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 4bJM7G46gZz5ykGw; Fri, 13 Jun 2025 01:21:46 +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 4bJM7F4F6Pz3Kmb; Fri, 13 Jun 2025 01:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749777705; 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=qW1cA8rPwKzFN0CzAleHpHz41PqjVbQYkTE2Yh4vbFg=; b=lFdZYpvOCzQSr3+FZjwgFHkM3qyvkWPrkDTzLx04sJQ5csl2AIchQZ8ayOgJcE5ozXg77J IThgNcslBh8Qw12g2SrRM1PeLvhXNuJzn+zO8J3P5UXqDFdYGQgoAQG9ZzJVLvrh1FU/7a NV0PFGUVHUtd+R6pzz9e5H05ekzkjpFYh4StDs9MNLBZ3Gslwpnz8nMZebHP+mxSjd8KsY QVWSqngS6+lGvgIT2qB+zSlBkg0AI+W+v+SbRmA1YuNQlrHG+F7N2lM+oGB5J9ZIkyyASm 70hdfIi/ITj6FulVMM9uFuIAIkhhR8+yw4vab8VgM7A3MZvHtBqOgVeTuKsciA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749777705; 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=qW1cA8rPwKzFN0CzAleHpHz41PqjVbQYkTE2Yh4vbFg=; b=m0LZ6mLggnyEy9IlEO1pbdU/vuptSI3V/qslRBUi/CJqDvw9HC8InInbFUTpjxg0rrvohD 4vxSBQjPO2VHiJyEM8RI60UfebKHGo8zxmM/ANW7Y4RBRLrcQVoPDEAynsGZ/c3CAqYA8T 2/4/NBBXF28PzVTv1/zlw8+0K5OHnXdaQzEHJb74THId5y/32axtcuGUogcPDLXkNp/4xP fIBRJI7MtJrBlKVVAYtRMRUoFQjzswfmH3ZvwliT/Tb0zA35DI/ow28chOL5n+NJbdBAab 0L2AFrJMpIjLqCw4fJb47HLJ/0uajEtfPQx5Vi/RUb/5S9lkzqiOMIgEd6EFGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749777705; a=rsa-sha256; cv=none; b=iDYHne5YFD+aPyDHKummwdE/qxOKJjG7eHPylprLkKpbxQpzkH5gKQ8dONeMmVqrM53qsC WqHndYCBuYyR3lXZujlhLbayFMDZGkoSO6rLhbI9WU0FbcdUMkJOgAGXAFS7xF4upc/GyR WIpEz8dobJc0nvkYybkRDaXsbGBzSsGml7ua3Z12O7G2bTTDnKFWaUllgjniKE5+HV9s4y wY7cZtxc7OrN5A/1Qdno9CqKMPEpEBURvdhsEdXMfVgz5z5stYKwucXBRTRUATI+vFZBlY niw/OSu+0TOASNufoCArNot0QCr9hBDRSJzaWswPKLNQ5fnmbjBKT3z83ml3SA== 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 4bJM7F3jTszdVB; Fri, 13 Jun 2025 01:21: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 55D1Lj9S086529; Fri, 13 Jun 2025 01:21:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55D1LjOB086526; Fri, 13 Jun 2025 01:21:45 GMT (envelope-from git) Date: Fri, 13 Jun 2025 01:21:45 GMT Message-Id: <202506130121.55D1LjOB086526@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: d0f4b71cc053 - main - Makefile.inc1: minor style changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d0f4b71cc053c3d28870c1bf47c4f1d2c7d49d3a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d0f4b71cc053c3d28870c1bf47c4f1d2c7d49d3a commit d0f4b71cc053c3d28870c1bf47c4f1d2c7d49d3a Author: Siva Mahadevan AuthorDate: 2024-10-04 22:35:08 +0000 Commit: Warner Losh CommitDate: 2025-06-13 01:21:44 +0000 Makefile.inc1: minor style changes Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1445 --- Makefile.inc1 | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e56c40c114fc..50efeecd5def 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1999,8 +1999,8 @@ PKG_EXT= ${PKG_FORMAT} PKG_EXT= pkg .endif -.if !defined(PKG_VERSION_FROM) && make(real-update-packages) -.if exists(${PKG_ABI_FILE}) && exists(${REPODIR}/${PKG_ABI}/latest) +.if !defined(PKG_VERSION_FROM) && make(real-update-packages) && \ + exists(${PKG_ABI_FILE}) && exists(${REPODIR}/${PKG_ABI}/latest) PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest PKG_VERSION_FROM_DIR= ${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM} # Determine the name of the branch base on the version @@ -2023,11 +2023,6 @@ BRANCH_EXT_FROM= rc .elif ${PKG_VERSION_FROM:M*.a*} BRANCH_EXT_FROM= alpha .endif -.else -PKG_VERSION_FROM= -PKG_VERSION_FROM_DIR= -BRANCH_EXT_FROM= -.endif .endif PKGMAKEARGS+= PKG_VERSION=${PKG_VERSION} \ @@ -2051,9 +2046,7 @@ real-packages: stage-packages create-packages sign-packages .PHONY real-update-packages: stage-packages .PHONY ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages -.if empty(PKG_VERSION_FROM_DIR) - @echo "==> Bootstrapping repository, not checking for new packages" -.else +.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 \ pkgname=$$(pkg query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ @@ -2071,9 +2064,10 @@ real-update-packages: stage-packages .PHONY echo "==> New package $${newpkgname}" ; \ fi ; \ done +.else + @echo "==> Bootstrapping repository, not checking for new packages" .endif - ${_+_}@cd ${.CURDIR}; \ - ${MAKE} -f Makefile.inc1 PKG_VERSION=${PKG_VERSION} sign-packages + ${_+_}${MAKE} -C ${.CURDIR} -f Makefile.inc1 PKG_VERSION=${PKG_VERSION} sign-packages stage-packages-world: .PHONY @mkdir -p ${WSTAGEDIR}