Date: Thu, 12 Mar 2026 01:38:52 +0000 From: Lexi Winter <ivy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh <imp@FreeBSD.org> Subject: git: 1346ffb457d5 - stable/15 - Makefile.inc1: Remove svn support Message-ID: <69b2192c.36094.4099b240@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1346ffb457d512323940d3d9dd18776539bf0087 commit 1346ffb457d512323940d3d9dd18776539bf0087 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2025-10-05 14:25:06 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> 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} \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b2192c.36094.4099b240>