The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e290182bcf3895ca659dff111bca6a077c4708b1
commit e290182bcf3895ca659dff111bca6a077c4708b1
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2021-06-11 21:56:28 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2021-06-11 21:56:28 +0000
Remove 'make update'.
In the CVS days this used be a wrapper around either CVS or CVSup and
used to support updating src, doc, and ports checkouts. With the move
to subversion this only supported updating src and was itself a
wrapper around 'svn update'. With Git, users are probably better off
using appropriate Git commands directly to update without needing an
explicit make target as a wrapper.
Reviewed by: bcr, imp, emaste
Differential Revision: https://reviews.freebsd.org/D30736
---
Makefile | 3 +--
Makefile.inc1 | 27 ---------------------------
share/man/man5/make.conf.5 | 25 +------------------------
3 files changed, 2 insertions(+), 53 deletions(-)
diff --git a/Makefile b/Makefile
index 3b37b7e1f669..711854f4693c 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@
# kernel-toolchain - Builds the subset of world necessary to build a kernel
# kernel-toolchains - Build kernel-toolchain for all universe targets.
# doxygen - Build API documentation of the kernel, needs doxygen.
-# update - Convenient way to update your source tree(s).
# checkworld - Run test suite on installed world.
# check-old - List obsolete directories/files/libraries.
# check-old-dirs - List obsolete directories.
@@ -155,7 +154,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel
buildworld \
installkernel.debug packagekernel packageworld \
reinstallkernel reinstallkernel.debug \
installworld kernel-toolchain libraries maninstall \
- obj objlink showconfig tags toolchain update \
+ obj objlink showconfig tags toolchain \
makeman sysent \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _build-metadata _cross-tools _includes _libraries \
diff --git a/Makefile.inc1 b/Makefile.inc1
index d72e0ca56beb..b06c269b6489 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -11,9 +11,7 @@
# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
# -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel
-# -DNO_PORTSUPDATE do not update ports in ${MAKE} update
# -DNO_ROOT install without using root privilege
-# -DNO_DOCUPDATE do not update doc in ${MAKE} update
# -DWITHOUT_CTF do not run the DTrace CTF conversion tools on built
objects
# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
# LOCAL_ITOOLS="list of tools" to add additional tools to the ITOOLS list
@@ -491,17 +489,6 @@ BUILDENV_SHELL?=/bin/sh
.endif
.if !defined(_MKSHOWCONFIG)
-.if !defined(SVN_CMD) || empty(SVN_CMD)
-. for _P in /usr/bin /usr/local/bin
-. for _S in svn svnlite
-. if exists(${_P}/${_S})
-SVN_CMD= ${_P}/${_S}
-. endif
-. endfor
-. endfor
-.export SVN_CMD
-.endif
-SVNFLAGS?= -r HEAD
.if !defined(VCS_REVISION) || empty(VCS_REVISION)
.if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD)
. for _D in ${PATH:S,:, ,g}
@@ -2113,20 +2100,6 @@ doxygen: .PHONY
fi
${_+_}cd ${.CURDIR}/tools/kerneldoc/subsys; ${MAKE} obj all
-#
-# update
-#
-# Update the source tree(s), by running svn/svnup to update to the
-# latest copy.
-#
-update: .PHONY
-.if defined(SVN_UPDATE)
- @echo "--------------------------------------------------------------"
- @echo ">>> Updating ${.CURDIR} using Subversion"
- @echo "--------------------------------------------------------------"
- @(cd ${.CURDIR}; ${SVN_CMD} update ${SVNFLAGS})
-.endif
-
#
# ------------------------------------------------------------------------
#
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 3dffdf7b402c..b8bb71ddc165 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 20, 2020
+.Dd June 11, 2021
.Dt MAKE.CONF 5
.Os
.Sh NAME
@@ -229,29 +229,6 @@ Setting this variable will prevent CPU specific compiler
flags
from being automatically added to
.Va CFLAGS
during compile time.
-.It Va NO_DOCUPDATE
-.Pq Vt bool
-Set this to not update the doc tree during
-.Dq Li "make update" .
-.It Va NO_PORTSUPDATE
-.Pq Vt bool
-Set this to not update the ports tree during
-.Dq Li "make update" .
-.It Va SVN_UPDATE
-.Pq Vt bool
-Set this to use
-.Xr svn 1
-or
-.Xr svnlite 1
-to update your
-.Pa src
-tree with
-.Dq Li "make update" .
-Note that you can set
-.Va SVN
-to the full path of a
-.Xr svn 1
-binary.
.El
.Ss "BUILDING THE KERNEL"
The following list provides a name and short description for variables
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
