Module Name: src
Committed By: lukem
Date: Sun Aug 21 07:10:03 UTC 2022
Modified Files:
src: Makefile build.sh
src/distrib/sets: Makefile checkflist comments descrs makeflist
makeobsolete makesrctars maketars mkvars.mk sets.subr
src/doc: BUILDING.mdoc
src/etc: Makefile
src/etc/mtree: Makefile
src/share/man/man7: src.7
src/share/mk: bsd.README bsd.own.mk
Log Message:
Deprecate extsrc/, EXTSRCSRCDIR, MKEXTSRC
Remove support for building extsrc/:
1. Makefile: remove do-extsrc target.
2. build.sh: remove options -y and -Y extsrcdir.
3. distrib/sets: remove support for extsrc in various tools
including the options -L ext and -y, and the extsrc sets.
4. doc/BUILDING.mdoc: remove docs for extsrc/, EXTSRCSRCDIR, MKEXTSRC (etc)
5. bsd.own.mk and various Makefiles: remove support for extsrc/,
EXTSRCSRCDIR, MKEXTSRC.
As proposed on tech-kern and tech-userlevel on 2022-01-07
and followed up on 2022-08-21.
To generate a diff of this commit:
cvs rdiff -u -r1.334 -r1.335 src/Makefile
cvs rdiff -u -r1.363 -r1.364 src/build.sh
cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/Makefile
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/checkflist
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/comments src/distrib/sets/descrs
cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/makeflist
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/makeobsolete
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/makesrctars
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/maketars
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.201 -r1.202 src/distrib/sets/sets.subr
cvs rdiff -u -r1.134 -r1.135 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.465 -r1.466 src/etc/Makefile
cvs rdiff -u -r1.47 -r1.48 src/etc/mtree/Makefile
cvs rdiff -u -r1.16 -r1.17 src/share/man/man7/src.7
cvs rdiff -u -r1.440 -r1.441 src/share/mk/bsd.README
cvs rdiff -u -r1.1287 -r1.1288 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.334 src/Makefile:1.335
--- src/Makefile:1.334 Sat Mar 19 14:35:13 2022
+++ src/Makefile Sun Aug 21 07:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.334 2022/03/19 14:35:13 rillig Exp $
+# $NetBSD: Makefile,v 1.335 2022/08/21 07:10:03 lukem Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -99,7 +99,6 @@
# do-x11: builds and installs X11 tools and libraries
# from src/external/mit/xorg if ${MKX11} != "no".
# do-build: builds and installs the entire system.
-# do-extsrc: builds and installs extsrc if ${MKEXTSRC} != "no".
# do-obsolete: installs the obsolete sets (for the postinstall-* targets).
#
@@ -251,9 +250,6 @@ BUILDTARGETS+= do-x11
.endif
.if !defined(NOBINARIES)
BUILDTARGETS+= do-build
-.if ${MKEXTSRC} != "no"
-BUILDTARGETS+= do-extsrc
-.endif
BUILDTARGETS+= do-obsolete
.endif
@@ -514,14 +510,6 @@ do-x11: .PHONY .MAKE
@false
.endif
-do-extsrc: .PHONY .MAKE
-.if ${MKEXTSRC} != "no"
- ${MAKEDIRTARGET} extsrc build
-.else
- @echo "MKEXTSRC is not enabled"
- @false
-.endif
-
do-obsolete: .PHONY .MAKE
${MAKEDIRTARGET} etc install-obsolete-lists
Index: src/build.sh
diff -u src/build.sh:1.363 src/build.sh:1.364
--- src/build.sh:1.363 Mon Aug 15 10:06:00 2022
+++ src/build.sh Sun Aug 21 07:10:03 2022
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.363 2022/08/15 10:06:00 lukem Exp $
+# $NetBSD: build.sh,v 1.364 2022/08/21 07:10:03 lukem Exp $
#
# Copyright (c) 2001-2022 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1027,10 +1027,10 @@ synopsis()
{
cat <<_usage_
-Usage: ${progname} [-EnoPRrUuxy] [-a arch] [-B buildid] [-C cdextras]
+Usage: ${progname} [-EnoPRrUux] [-a arch] [-B buildid] [-C cdextras]
[-c compiler] [-D dest] [-j njob] [-M obj] [-m mach]
[-N noisy] [-O obj] [-R release] [-S seed] [-T tools]
- [-V var=[value]] [-w wrapper] [-X x11src] [-Y extsrcsrc]
+ [-V var=[value]] [-w wrapper] [-X x11src]
[-Z var]
operation [...]
${progname} ( -h | -? )
@@ -1139,8 +1139,6 @@ help()
[Default: \${TOOLDIR}/bin/${toolprefix}make-\${MACHINE}]
-X x11src Set X11SRCDIR to x11src. [Default: /usr/xsrc]
-x Set MKX11=yes; build X11 from X11SRCDIR
- -Y extsrcsrc Set EXTSRCSRCDIR to extsrcsrc. [Default: /usr/extsrc]
- -y Set MKEXTSRC=yes; build extsrc from EXTSRCSRCDIR
-Z var Unset ("zap") variable 'var'.
-? Print this help message, and exit.
@@ -1161,7 +1159,7 @@ usage()
parseoptions()
{
- opts='a:B:C:c:D:Ehj:M:m:N:nO:oPR:rS:T:UuV:w:X:xY:yZ:'
+ opts='a:B:C:c:D:Ehj:M:m:N:nO:oPR:rS:T:UuV:w:X:xZ:'
opt_a=false
opt_m=false
@@ -1355,15 +1353,6 @@ parseoptions()
setmakeenv MKX11 yes
;;
- -Y)
- eval ${optargcmd}; resolvepath OPTARG
- setmakeenv EXTSRCSRCDIR "${OPTARG}"
- ;;
-
- -y)
- setmakeenv MKEXTSRC yes
- ;;
-
-Z)
eval ${optargcmd}
# XXX: consider restricting which variables can be unset?
@@ -2018,7 +2007,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.363 2022/08/15 10:06:00 lukem Exp $
+# Generated from: \$NetBSD: build.sh,v 1.364 2022/08/21 07:10:03 lukem Exp $
# with these arguments: ${_args}
#
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.107 src/distrib/sets/Makefile:1.108
--- src/distrib/sets/Makefile:1.107 Sun Mar 10 11:04:08 2019
+++ src/distrib/sets/Makefile Sun Aug 21 07:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2019/03/10 11:04:08 mrg Exp $
+# $NetBSD: Makefile,v 1.108 2022/08/21 07:10:03 lukem Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -50,16 +50,10 @@ MAKETARS_FLAGS+= -T "${MKREPRO_TIMESTAMP
.if ${MKX11} != "no"
MAKESRCTARS_X11_FLAGS= -x ${X11SRCDIR}
.endif
-.if ${MKEXTSRC} != "no"
-MAKESRCTARS_EXTSRC_FLAGS= -y ${EXTSRCSRCDIR}
-.endif
.if ${MKX11} != "no"
MAKEFLIST_X11_FLAGS= ,x
.endif
-.if ${MKEXTSRC} != "no"
-MAKEFLIST_EXTSRC_FLAGS= ,ext
-.endif
-MAKEFLIST_FLAGS= -L base${MAKEFLIST_X11_FLAGS}${MAKEFLIST_EXTSRC_FLAGS}
+MAKEFLIST_FLAGS= -L base${MAKEFLIST_X11_FLAGS}
MAKESRCTARS_FLAGS= -N ${NETBSDSRCDIR}/etc
.if ${MAKEVERBOSE} < 2
@@ -185,9 +179,6 @@ checkflist: .PRECIOUS .PHONY check_DESTD
checkflist-x11: .PHONY check_DESTDIR
${SETSCMD} ./checkflist -x ${CHECKFLIST_FLAGS}
-checkflist-extsrc: .PHONY check_DESTDIR
- ${SETSCMD} ./checkflist -y ${CHECKFLIST_FLAGS}
-
.if defined(DESTDIR) && ${DESTDIR} != ""
checkflist_if_DESTDIR: checkflist
.else
@@ -251,7 +242,7 @@ makesrctars: .PRECIOUS .PHONY check_RELE
${_MKMSG_CREATE} "source tar files"
mkdir -p ${SOURCETARDIR}
${SETSCMD} ./makesrctars ${MAKESRCTARS_FLAGS} \
- ${MAKESRCTARS_X11_FLAGS} ${MAKESRCTARS_EXTSRC_FLAGS} \
+ ${MAKESRCTARS_X11_FLAGS} \
${NETBSDSRCDIR} ${SOURCETARDIR}
Index: src/distrib/sets/checkflist
diff -u src/distrib/sets/checkflist:1.45 src/distrib/sets/checkflist:1.46
--- src/distrib/sets/checkflist:1.45 Thu Mar 1 07:18:39 2018
+++ src/distrib/sets/checkflist Sun Aug 21 07:10:03 2022
@@ -1,6 +1,6 @@
#! /bin/sh --
#
-# $NetBSD: checkflist,v 1.45 2018/03/01 07:18:39 snj Exp $
+# $NetBSD: checkflist,v 1.46 2022/08/21 07:10:03 lukem Exp $
#
# Verify output of makeflist against contents of ${DESTDIR} and ${metalog}.
@@ -51,16 +51,12 @@ allowextra=false
allowmissing=false
# handle args
-while getopts xybL:M:em ch; do
+while getopts xbL:M:em ch; do
case ${ch} in
x)
xargs="-x"
origin="./etc/X11 ./etc/fonts ./usr/X11R7"
;;
- y)
- xargs="-y"
- origin="./etc/ext ./usr/ext"
- ;;
# backward compat
b)
xargs="-b"
@@ -79,9 +75,8 @@ while getopts xybL:M:em ch; do
;;
*)
cat 1>&2 <<USAGE
-Usage: ${prog} [-x|-y|-b|-L lists] [-M metalog] [-e] [-m]
+Usage: ${prog} [-x|-b|-L lists] [-M metalog] [-e] [-m]
-x check only x11 lists
- -y check only extsrc lists
-b check netbsd + x11 lists
-L base,x,ext check specified lists
-M metalog metalog file
Index: src/distrib/sets/comments
diff -u src/distrib/sets/comments:1.29 src/distrib/sets/comments:1.30
--- src/distrib/sets/comments:1.29 Sun May 22 11:27:33 2022
+++ src/distrib/sets/comments Sun Aug 21 07:10:03 2022
@@ -256,7 +256,6 @@ etc-cron-log empty log file for cron(8)
etc-cron-rc startup script for cron(8) command scheduler
etc-cron-root root file system support for cron(8) command scheduler
etc-dhcpd-rc startup script for DHCP dynamic host configuration protocol daemon
-etc-extsrc-rc startup scripts for externally added programs
etc-games-etc configuration file for games
etc-games-scores empty score files for games
etc-ipf-rc startup scripts for IP filter
Index: src/distrib/sets/descrs
diff -u src/distrib/sets/descrs:1.29 src/distrib/sets/descrs:1.30
--- src/distrib/sets/descrs:1.29 Sun Dec 5 07:18:53 2021
+++ src/distrib/sets/descrs Sun Aug 21 07:10:03 2022
@@ -512,7 +512,6 @@ etc-cron-log empty log file for cron(8)
etc-cron-rc startup script for cron(8) command scheduler
etc-cron-root root file system support for cron(8) command scheduler
etc-dhcpd-rc startup script for DHCP dynamic host configuration protocol daemon
-etc-extsrc-rc startup scripts for externally added programs
etc-games-etc configuration file for games
etc-games-scores empty score files for games
etc-ipf-rc startup script for IP filter
Index: src/distrib/sets/makeflist
diff -u src/distrib/sets/makeflist:1.77 src/distrib/sets/makeflist:1.78
--- src/distrib/sets/makeflist:1.77 Mon Jan 14 20:29:26 2013
+++ src/distrib/sets/makeflist Sun Aug 21 07:10:03 2022
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makeflist,v 1.77 2013/01/14 20:29:26 christos Exp $
+# $NetBSD: makeflist,v 1.78 2022/08/21 07:10:03 lukem Exp $
#
# Print out the files in some or all lists.
# Usage: makeflist [-bxlo] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -13,11 +13,10 @@ lists=
usage()
{
cat 1>&2 <<USAGE
-Usage: ${0##*/} [-L base,x,ext] [-bxyo] [-a arch] [-m machine] [-s setsdir] [setname [...]]
- -L base,x,ext print specified lists
+Usage: ${0##*/} [-L base,x] [-bxo] [-a arch] [-m machine] [-s setsdir] [setname [...]]
+ -L base,x print specified lists
-b print netbsd + x11 lists
-x print make x11 lists
- -y print make extsrc lists
-l just list the selected set names, not the contents
-o only match obsolete files
-a arch set arch (e.g, m68k, mipseb, mipsel, powerpc) [${MACHINE_ARCH}]
@@ -38,7 +37,6 @@ while getopts L:bxloa:m:s: ch; do
case $_list in
base) lists="${lists} ${nlists}" ;;
x) lists="${lists} ${xlists}" ;;
- ext) lists="${lists} ${extlists}" ;;
esac
done
IFS="${save_IFS}"
@@ -50,9 +48,6 @@ while getopts L:bxloa:m:s: ch; do
x)
lists="${xlists}"
;;
- y)
- lists="${extlists}"
- ;;
l)
listonly=1
;;
Index: src/distrib/sets/makeobsolete
diff -u src/distrib/sets/makeobsolete:1.31 src/distrib/sets/makeobsolete:1.32
--- src/distrib/sets/makeobsolete:1.31 Sat Dec 5 15:56:25 2009
+++ src/distrib/sets/makeobsolete Sun Aug 21 07:10:03 2022
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makeobsolete,v 1.31 2009/12/05 15:56:25 cegger Exp $
+# $NetBSD: makeobsolete,v 1.32 2022/08/21 07:10:03 lukem Exp $
#
# Print out the obsolete files for a set
# Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@@ -17,10 +17,9 @@ usage()
{
cat 1>&2 <<USAGE
Usage: ${0##*/} [-a arch] [-m machine] [-s setsdir] [setname ...]
- -L base,x,ext make specified lists
+ -L base,x make specified lists
-b make netbsd + x11 lists
-x only make x11 lists
- -y only make extsrc lists
-a arch set arch (e.g, m68k, mips, powerpc) [${MACHINE_ARCH}]
-m machine set machine (e.g, amiga, i386, macppc) [${MACHINE}]
-s setsdir directory to find sets [${setd}]
@@ -30,7 +29,7 @@ USAGE
exit 1
}
-while getopts L:bxya:m:s:t: ch; do
+while getopts L:bxa:m:s:t: ch; do
case ${ch} in
L)
save_IFS="${IFS}"
@@ -39,7 +38,6 @@ while getopts L:bxya:m:s:t: ch; do
case $_list in
base) lists="${lists} ${nlists}" ;;
x) lists="${lists} ${xlists}" ;;
- ext) lists="${lists} ${extlists}" ;;
esac
done
IFS="${save_IFS}"
@@ -51,9 +49,6 @@ while getopts L:bxya:m:s:t: ch; do
x)
lists="${xlists}"
;;
- y)
- lists="${extlists}"
- ;;
a)
MACHINE_ARCH="${OPTARG}"
MACHINE_CPU="$(arch_to_cpu "${OPTARG}")"
Index: src/distrib/sets/makesrctars
diff -u src/distrib/sets/makesrctars:1.43 src/distrib/sets/makesrctars:1.44
--- src/distrib/sets/makesrctars:1.43 Tue Sep 7 18:02:46 2021
+++ src/distrib/sets/makesrctars Sun Aug 21 07:10:03 2022
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: makesrctars,v 1.43 2021/09/07 18:02:46 martin Exp $
+# $NetBSD: makesrctars,v 1.44 2022/08/21 07:10:03 lukem Exp $
#
# makesrctars srcdir setdir
# Create source tarballs in setdir from the source under srcdir.
@@ -20,12 +20,11 @@ export GZIP
usage()
{
cat 1>&2 <<USAGE
-Usage: ${prog} [-N password/group dir] [-q] [-x xsrcdir] [-y extsrcsrcdir] srcdir setdir
+Usage: ${prog} [-N password/group dir] [-q] [-x xsrcdir] srcdir setdir
-N dir location which contains master.passwd and group files
(defaults to \${srcdir}/etc)
-q quiet operation
-x xsrcdir build xsrc.tgz from xsrcdir
- -y extsrcsrcdir build extsrc.tgz from extsrcsrcdir
srcdir location of sources
setdir where to write the .tgz files to
USAGE
@@ -39,7 +38,7 @@ msg()
# handle args
-while getopts N:qx:y: ch; do
+while getopts N:qx: ch; do
case ${ch} in
q)
quiet=true
@@ -47,9 +46,6 @@ while getopts N:qx:y: ch; do
x)
xsrcdir="${OPTARG}"
;;
- y)
- extsrcsrcdir="${OPTARG}"
- ;;
N)
PASSWD="${OPTARG}"
;;
@@ -138,18 +134,6 @@ if [ -n "${xsrcdir}" ]; then
fi
-# create extsrc sets
-#
-if [ -n "${extsrcsrcdir}" ]; then
- if ! cd "${extsrcsrcdir}"; then
- echo >&2 "${prog}: can't chdir to ${extsrcsrcdir}"
- exit 1
- fi
- srcprefix=usr/extsrc
- makeset extsrc .
-fi
-
-
msg "Creating checksum files"
(cd "${setdir}"
${CKSUM} -a md5 *.tgz *.tar.xz > MD5
Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.93 src/distrib/sets/maketars:1.94
--- src/distrib/sets/maketars:1.93 Sat Sep 25 08:54:30 2021
+++ src/distrib/sets/maketars Sun Aug 21 07:10:03 2022
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: maketars,v 1.93 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: maketars,v 1.94 2022/08/21 07:10:03 lukem Exp $
#
# Make release tar files for some or all lists. Usage:
# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -9,11 +9,10 @@
#
# The default sets are "base comp debug dtb etc games gpufw man misc rescue tests text"
# The X sets are "xbase xcomp xdebug xetc xfont xserver"
-# The extsrc sets are "extbase extcomp extetc"
#
# If '-i installdir' is given, copy the given sets to installdir
# (using pax -rw ...) instead of creating tar files.
-# In this case, remove "etc", "xetc", and "extetc" from the list of default sets.
+# In this case, remove "etc", and "xetc" from the list of default sets.
#
prog="${0##*/}"
@@ -37,15 +36,13 @@ preserve="-pe"
usage()
{
cat 1>&2 <<USAGE
-Usage: ${prog} [-L base,x,ext] [-b] [-x] [-y] [-i idir] [-a arch] [-m machine]
+Usage: ${prog} [-L base,x] [-b] [-x] [-i idir] [-a arch] [-m machine]
[-s setsdir] [-S] [-M metalog] [-N etcdir] [-F setlistdir]
[-d dest] [-t targetdir] [setname ...]
- -L base,x,ext Make specified lists
+ -L base,x Make specified lists
-b Make both netbsd and x11 lists
-x Only make x11 lists
[Default: make netbsd lists]
- -y Only make extsrc lists
- [Default: make netbsd lists]
-i idir Install sets to idir instead of creating tar files
-a arch Set arch (e.g, m68k, mipseb, mipsel, powerpc) [${MACHINE_ARCH}]
-m machine Set machine (e.g, amiga, i386, macppc) [${MACHINE}]
@@ -70,7 +67,7 @@ msg()
}
# handle args
-while getopts L:bxyi:a:m:qs:F:SM:N:Ud:t:T: ch; do
+while getopts L:bxi:a:m:qs:F:SM:N:Ud:t:T: ch; do
case ${ch} in
L)
save_IFS="${IFS}"
@@ -79,7 +76,6 @@ while getopts L:bxyi:a:m:qs:F:SM:N:Ud:t:
case $_list in
base) lists="${lists} ${nlists}" ;;
x) lists="${lists} ${xlists}" ;;
- ext) lists="${lists} ${extlists}" ;;
esac
done
IFS="${save_IFS}"
@@ -91,9 +87,6 @@ while getopts L:bxyi:a:m:qs:F:SM:N:Ud:t:
x)
lists="${xlists}"
;;
- y)
- lists="${extlists}"
- ;;
i)
installdir="${OPTARG}"
;;
@@ -140,8 +133,8 @@ while getopts L:bxyi:a:m:qs:F:SM:N:Ud:t:
esac
done
shift $((${OPTIND} - 1))
-if [ -n "${installdir}" ]; then # if -i, remove etc + xetc + extetc from the default list
- lists="$(echo ${lists} | ${SED} -e 's/ etc / /;s/ xetc / /;s/ extetc / /')"
+if [ -n "${installdir}" ]; then # if -i, remove etc + xetc from the default list
+ lists="$(echo ${lists} | ${SED} -e 's/ etc / /;s/ xetc / /;')"
fi
if [ -n "$*" ]; then
lists="$*"
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.40 src/distrib/sets/mkvars.mk:1.41
--- src/distrib/sets/mkvars.mk:1.40 Sat Sep 26 17:49:49 2020
+++ src/distrib/sets/mkvars.mk Sun Aug 21 07:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.40 2020/09/26 17:49:49 jmcneill Exp $
+# $NetBSD: mkvars.mk,v 1.41 2022/08/21 07:10:03 lukem Exp $
MKEXTRAVARS= \
MACHINE \
@@ -18,7 +18,6 @@ MKEXTRAVARS= \
HAVE_UEFI \
OBJECT_FMT \
TOOLCHAIN_MISSING \
- EXTSRCS \
KERNEL_DIR \
MKMANZ \
MKBFD \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.201 src/distrib/sets/sets.subr:1.202
--- src/distrib/sets/sets.subr:1.201 Fri Dec 31 17:51:14 2021
+++ src/distrib/sets/sets.subr Sun Aug 21 07:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.201 2021/12/31 17:51:14 christos Exp $
+# $NetBSD: sets.subr,v 1.202 2022/08/21 07:10:03 lukem Exp $
#
#
@@ -6,7 +6,6 @@
# setsdir path to src/distrib/sets
# nlists list of base sets
# xlists list of x11 sets
-# extlists list of extsrc sets
# obsolete controls if obsolete files are selected instead
# module if != "no", enable MODULE sets
# shlib shared library format (a.out, elf, or "")
@@ -173,7 +172,6 @@ if [ "${MKPIC}" = "no" ]; then
fi
nlists="base comp $debugset $dtbset etc games gpufw man misc $modset rescue $testset text"
xlists="xbase xcomp $xdebugset xetc xfont xserver"
-extlists="extbase extcomp extetc"
OSRELEASE=$(${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -k)
if [ "${KERNEL_DIR}" = "yes" ]; then
@@ -192,7 +190,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.201 2021/12/31 17:51:14 christos Exp $
+# # $NetBSD: sets.subr,v 1.202 2022/08/21 07:10:03 lukem Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.134 src/doc/BUILDING.mdoc:1.135
--- src/doc/BUILDING.mdoc:1.134 Sat May 28 21:54:56 2022
+++ src/doc/BUILDING.mdoc Sun Aug 21 07:10:03 2022
@@ -1,6 +1,6 @@
-.\" $NetBSD: BUILDING.mdoc,v 1.134 2022/05/28 21:54:56 andvar Exp $
+.\" $NetBSD: BUILDING.mdoc,v 1.135 2022/08/21 07:10:03 lukem Exp $
.\"
-.\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2001-2022 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
@@ -169,11 +169,6 @@ If any of these directories are missing,
.Dq Reachover
build structure for modular Xorg; the source is in
.Sy X11SRCDIR .
-.It Pa extsrc/
-.Dq Reachover
-build structure for externally added programs and libraries;
-the source is in
-.Sy EXTSRCSRCDIR .
.El
.
.Ss Build tree layout
@@ -446,15 +441,6 @@ unless run in
.Sq expert
mode.
.
-.It Sy EXTSRCSRCDIR
-Directory containing sources of externally added programs
-and libraries.
-If specified, must be an absolute path.
-.DFLT
-.Sy NETBSDSRCDIR Ns Pa /../extsrc ,
-if that exists; otherwise
-.Pa /usr/extsrc .
-.
.It Sy MAKECONF
The name of the
.Xr make 1
@@ -537,12 +523,6 @@ Indicates whether system documentation d
will be installed during a build.
.DFLTy
.
-.It Sy MKEXTSRC
-.YorN
-Indicates whether extsrc is built from
-.Sy EXTSRCSRCDIR .
-.DFLTn
-.
.It Sy MKHTML
.YorN
Indicates whether preformatted HTML manual pages will be built
@@ -2031,18 +2011,6 @@ absolute path before being used.
Set
.Sy MKX11=yes .
.
-.It Fl Y Ar extsrcdir
-Set the value of
-.Sy EXTSRCSRCDIR
-to
-.Ar extsrcdir .
-If a relative path is specified, it will be converted to an
-absolute path before being used.
-.
-.It Fl y
-Set
-.Sy MKEXTSRC=yes .
-.
.It Fl Z Ar var
Unset ("zap") the environment variable
.Ar var .
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.465 src/etc/Makefile:1.466
--- src/etc/Makefile:1.465 Mon Jun 6 10:56:28 2022
+++ src/etc/Makefile Sun Aug 21 07:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.465 2022/06/06 10:56:28 nia Exp $
+# $NetBSD: Makefile,v 1.466 2022/08/21 07:10:03 lukem Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -164,9 +164,6 @@ distribution: .PHONY .MAKE check_DESTDIR
. if ${MKX11} != "no"
${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/mit/xorg distribution
. endif
-. if ${MKEXTSRC} != "no"
- ${MAKEDIRTARGET} ${NETBSDSRCDIR}/extsrc distribution
-. endif
${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets makesetfiles
.endif # !DISTRIBUTION_DONE
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.47 src/etc/mtree/Makefile:1.48
--- src/etc/mtree/Makefile:1.47 Mon Jun 6 10:56:28 2022
+++ src/etc/mtree/Makefile Sun Aug 21 07:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2022/06/06 10:56:28 nia Exp $
+# $NetBSD: Makefile,v 1.48 2022/08/21 07:10:03 lukem Exp $
.include <bsd.own.mk>
@@ -65,10 +65,6 @@ EXTRA_DIST_FILES+= NetBSD.dist.dtb
EXTRA_DIST_FILES+= NetBSD.dist.dtrace
.endif
-.if ${MKEXTSRC} != "no"
-EXTRA_DIST_FILES+= NetBSD.dist.extsrc
-.endif
-
.if ${MKISCSI} != "no"
EXTRA_DIST_FILES+= NetBSD.dist.iscsi
.endif
Index: src/share/man/man7/src.7
diff -u src/share/man/man7/src.7:1.16 src/share/man/man7/src.7:1.17
--- src/share/man/man7/src.7:1.16 Thu May 14 16:32:57 2020
+++ src/share/man/man7/src.7 Sun Aug 21 07:10:03 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: src.7,v 1.16 2020/05/14 16:32:57 snj Exp $
+.\" $NetBSD: src.7,v 1.17 2022/08/21 07:10:03 lukem Exp $
.\"
.\" Copyright (c) 2012, 2013 Mingzhe Wang and Elvira Khabirova.
.\" All rights reserved.
@@ -182,11 +182,6 @@ and
.Pa external/public-domain/sqlite/
itself contain reachover Makefiles.
.El
-.It Pa extsrc/
-Optional developer-provided sources that are built if
-.Pa MKEXTSRC=yes ,
-as a way to include extra components in the
-build.
.It Pa games/
Sources for utilities/files in
.Pa /usr/games ;
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.440 src/share/mk/bsd.README:1.441
--- src/share/mk/bsd.README:1.440 Thu Jul 14 03:48:49 2022
+++ src/share/mk/bsd.README Sun Aug 21 07:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.440 2022/07/14 03:48:49 mrg Exp $
+# $NetBSD: bsd.README,v 1.441 2022/08/21 07:10:03 lukem Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -217,11 +217,6 @@ MKDYNAMICROOT If "no", build programs in
install the shared linker into /libexec.
Default: yes
-MKEXTSRC If not "no", 'make build' also descends into either src/extsrc
- to cross-build programs and libraries externally added by
- users, and automatically enables creation of those sets.
- Default: no
-
MKFIRMWARE If not "no", install the /libdata/firmware directory,
which is necessary for several drivers: athn(4), bwfm(4),
ipw(4), iwi(4), iwm(4), iwn(4), otus(4), rtwn(4), urtwn(4),
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1287 src/share/mk/bsd.own.mk:1.1288
--- src/share/mk/bsd.own.mk:1.1287 Wed Jul 27 18:29:35 2022
+++ src/share/mk/bsd.own.mk Sun Aug 21 07:10:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1287 2022/07/27 18:29:35 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1288 2022/08/21 07:10:03 lukem Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1300,7 +1300,6 @@ _MKVARS.no= \
MKBSDGREP \
MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCTF \
MKDEBUG MKDEBUGLIB MKDTB MKDTRACE \
- MKEXTSRC \
MKFIRMWARE \
MKGROFFHTMLDOC \
MKKYUA \
@@ -1668,25 +1667,6 @@ X11LOADABLE?= yes
#
-# Where extsrc sources are and where it is installed to.
-#
-.if !defined(EXTSRCSRCDIR)
-.if exists(${NETBSDSRCDIR}/../extsrc)
-EXTSRCSRCDIR!= cd "${NETBSDSRCDIR}/../extsrc" && pwd
-.else
-EXTSRCSRCDIR= /usr/extsrc
-.endif
-.endif # !defined(EXTSRCSRCDIR)
-
-EXTSRCROOTDIR?= /usr/ext
-EXTSRCBINDIR?= ${EXTSRCROOTDIR}/bin
-EXTSRCETCDIR?= /etc/ext
-EXTSRCINCDIR?= ${EXTSRCROOTDIR}/include
-EXTSRCLIBDIR?= ${EXTSRCROOTDIR}/lib/ext
-EXTSRCMANDIR?= ${EXTSRCROOTDIR}/man
-EXTSRCUSRLIBDIR?= ${EXTSRCROOTDIR}/lib
-
-#
# MAKEDIRTARGET dir target [extra make(1) params]
# run "cd $${dir} && ${MAKEDIRTARGETENV} ${MAKE} [params] $${target}", with a pretty message
#
