Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Oct 2025 14:26:26 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 28b858f5059c - main - Makefile.inc1: Remove svn support
Message-ID:  <202510051426.595EQQH2008284@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=28b858f5059c8b25fa08be494699997000fce58c

commit 28b858f5059c8b25fa08be494699997000fce58c
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2025-10-05 14:25:06 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-10-05 14:25:06 +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
---
 Makefile.inc1 | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index a75e5c760cdc..e508ffa88d4b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -522,27 +522,6 @@ BUILDENV_SHELL?=${SHELL}
 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
 .  if exists(${_P}/git)
@@ -2225,9 +2204,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} \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510051426.595EQQH2008284>