From nobody Thu Mar 12 01:38:52 2026 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 4fWVdY5tYyz6VMp2 for ; Thu, 12 Mar 2026 01:38:57 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWVdY3kpHz3ZH7 for ; Thu, 12 Mar 2026 01:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773279537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2uzEif/6mhM1Wzz8t4trXDUjymapqZMKBrX7HFnhS3g=; b=RIrd9mkb8mZrGaZTZHpf67W/QMSpLuZtD4XWuHtKuNVxboBKDc62TmAapuZYFoGWKQnCmx HFR6XpGTgiAfMGqDQ+NPNjy4HAKR1q/WS4hGFIXVQflZ3ZdObBsYIWtrHToZD7jqYeXcgb QesiU0Ip7Qabp8P84bADUF2GvoUEvjmsAWwhF3HrswDnb31m+Dz5p+QKWQhIYtjvus6dTh Upkxe/ldVU6erR/ilXPJyDi6dG27OeLaeess2ngsh9/+DfbPaqdaQ06iTi8tHmEwwWqzWR vTvLUWLctGD/m0gugt8LZ2jN6473MTdnPdEWS4DHNFYbwikxf1qN+uRgb770yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773279537; a=rsa-sha256; cv=none; b=cfHcIt49aHr1jlJ1rHt89vO6AKsErqW8EEojTcub8/J379wlspqT3EXc0TGWdJsrNtU7qb 0tnemAhzmX6oFPq7xJ5NT3FE7JwmfAnXI1Pyn+FfmQAijOmAsNJ7iIXaC0yuzqypLH2Qu8 H+i2egebRFT0+qe8TEOUEatJu2KamgD6Z19wuhs+PIVJjHpqaOwhA8emboZhxY7g7MqOEn zcNK/TIWAbCFKl+FTPM1H/HnJWYUJrQMatWa4MKiXGg9LKwR1/T3m/7xlz5BRCwZOsSmU5 LBxN3+94qbW280NP6aaTDfndf4wcNxetio6P1pD/j1SCCFt9oRG5c4r/nxL6Mw== 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=1773279537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2uzEif/6mhM1Wzz8t4trXDUjymapqZMKBrX7HFnhS3g=; b=v5xe762RfKO5o23jfvFVe+UazzzP6+ICvNmAPTPon8Z2wTnOIhsd507B0wMsILJE9ufYr3 7YLOvlOQ1Lt26Wj1z2J1FWhJBA2Hyv4UZdrrQGcpmH29qWOHwfPTV7PmCbAHwDBkiUndke ngqEtyrb/kydHCQhtYX+9ojpUUForpjoOL5bW5FeS2Hmnp5GuypeA0dD+T6RV8WWveHULU vpD3B1uXruMCWkVn6E/er3vMAs0QtcaPd/Iv8QGVwXj6dhrC0wKyZXGoTn9VGvmDA06VaV JnWROze2FWdnD+RJjz6qmR3PxnouLekgMNgDruH8o4pLKHVAnGrcYl4V3fPFxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWVdY26HQz8Rr for ; Thu, 12 Mar 2026 01:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36094 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 01:38:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: Lexi Winter Subject: git: 1346ffb457d5 - stable/15 - Makefile.inc1: Remove svn support 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1346ffb457d512323940d3d9dd18776539bf0087 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 01:38:52 +0000 Message-Id: <69b2192c.36094.4099b240@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1346ffb457d512323940d3d9dd18776539bf0087 commit 1346ffb457d512323940d3d9dd18776539bf0087 Author: Warner Losh AuthorDate: 2025-10-05 14:25:06 +0000 Commit: Lexi Winter CommitDate: 2026-03-12 01:37:38 +0000 Makefile.inc1: Remove svn support We don't need this, and we don't use this. It's left over from the svn days. We stopped supporting svn as a project entirely when 12.x went EOL. And VCS_REVSION isn't in any current ucl file or anywhere else in the tree. Sponsored by: Netflix Reviewed by : kevans, brd Differential Revision: https://reviews.freebsd.org/D52912 (cherry picked from commit 28b858f5059c8b25fa08be494699997000fce58c) Makefile.inc1: Add back missing if The .if defined(_MKSHOWCONFIG) covered an unusually large area, so it should have not been removed in the last commit. I must have tested in the wrong tree before pushing... FixeS: 28b858f5059c Sponsored by: Netflix (cherry picked from commit 106951f09fe39dc693fd7130ab4bc751e1438631) --- Makefile.inc1 | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e65021c356c5..0af5c38f0489 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -523,25 +523,6 @@ BUILDENV_SHELL?=/bin/sh .endif .if !defined(_MKSHOWCONFIG) -.if !defined(VCS_REVISION) || empty(VCS_REVISION) -.if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD) -. for _D in ${PATH:S,:, ,g} -. if exists(${_D}/svnversion) -SVNVERSION_CMD?=${_D}/svnversion -. endif -. if exists(${_D}/svnliteversion) -SVNVERSION_CMD?=${_D}/svnliteversion -. endif -. endfor -.endif -.if defined(SVNVERSION_CMD) && !empty(SVNVERSION_CMD) -_VCS_REVISION?= $$(eval ${SVNVERSION_CMD} ${SRCDIR}) -. if !empty(_VCS_REVISION) -VCS_REVISION= $$(echo r${_VCS_REVISION}) -.export VCS_REVISION -. endif -.endif -.endif .if !defined(GIT_CMD) || empty(GIT_CMD) . for _P in /usr/bin /usr/local/bin @@ -603,6 +584,7 @@ EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} .if !defined(PKG_VERSION) PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif + .endif # !defined(_MKSHOWCONFIG) PKG_NAME_PREFIX?= FreeBSD @@ -2299,9 +2281,6 @@ create-world-package-${pkgname}: .PHONY /^name/ { printf("===> Creating %s-", $$2); next } \ /^version/ { print $$2; next } \ ' ${WSTAGEDIR}/${pkgname}.ucl - @if [ "${pkgname}" == "runtime" ]; then \ - sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \ - fi ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \