Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Deprecate extsrc/, EXTSRCSRCDIR, MKEXTSRC
details: https://anonhg.NetBSD.org/src/rev/fdce14a6c62d
branches: trunk
changeset: 369538:fdce14a6c62d
user: lukem <lukem%NetBSD.org@localhost>
date: Sun Aug 21 07:10:03 2022 +0000
description:
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.
diffstat:
Makefile | 14 +-------------
build.sh | 21 +++++----------------
distrib/sets/Makefile | 15 +++------------
distrib/sets/checkflist | 11 +++--------
distrib/sets/comments | 1 -
distrib/sets/descrs | 1 -
distrib/sets/makeflist | 11 +++--------
distrib/sets/makeobsolete | 11 +++--------
distrib/sets/makesrctars | 22 +++-------------------
distrib/sets/maketars | 21 +++++++--------------
distrib/sets/mkvars.mk | 3 +--
distrib/sets/sets.subr | 6 ++----
doc/BUILDING.mdoc | 36 ++----------------------------------
etc/Makefile | 5 +----
etc/mtree/Makefile | 6 +-----
share/man/man7/src.7 | 7 +------
share/mk/bsd.README | 7 +------
share/mk/bsd.own.mk | 22 +---------------------
18 files changed, 38 insertions(+), 182 deletions(-)
diffs (truncated from 699 to 300 lines):
diff -r cf890d23d4ef -r fdce14a6c62d Makefile
--- a/Makefile Sun Aug 21 07:03:09 2022 +0000
+++ b/Makefile Sun Aug 21 07:10:03 2022 +0000
@@ -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 @@
.endif
.if !defined(NOBINARIES)
BUILDTARGETS+= do-build
-.if ${MKEXTSRC} != "no"
-BUILDTARGETS+= do-extsrc
-.endif
BUILDTARGETS+= do-obsolete
.endif
@@ -514,14 +510,6 @@
@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
diff -r cf890d23d4ef -r fdce14a6c62d build.sh
--- a/build.sh Sun Aug 21 07:03:09 2022 +0000
+++ b/build.sh Sun Aug 21 07:10:03 2022 +0000
@@ -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 @@
{
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 @@
[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 @@
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 @@
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 @@
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}
#
diff -r cf890d23d4ef -r fdce14a6c62d distrib/sets/Makefile
--- a/distrib/sets/Makefile Sun Aug 21 07:03:09 2022 +0000
+++ b/distrib/sets/Makefile Sun Aug 21 07:10:03 2022 +0000
@@ -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 @@
.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-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 @@
${_MKMSG_CREATE} "source tar files"
mkdir -p ${SOURCETARDIR}
${SETSCMD} ./makesrctars ${MAKESRCTARS_FLAGS} \
- ${MAKESRCTARS_X11_FLAGS} ${MAKESRCTARS_EXTSRC_FLAGS} \
+ ${MAKESRCTARS_X11_FLAGS} \
${NETBSDSRCDIR} ${SOURCETARDIR}
diff -r cf890d23d4ef -r fdce14a6c62d distrib/sets/checkflist
--- a/distrib/sets/checkflist Sun Aug 21 07:03:09 2022 +0000
+++ b/distrib/sets/checkflist Sun Aug 21 07:10:03 2022 +0000
@@ -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 @@
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 @@
;;
*)
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
diff -r cf890d23d4ef -r fdce14a6c62d distrib/sets/comments
--- a/distrib/sets/comments Sun Aug 21 07:03:09 2022 +0000
+++ b/distrib/sets/comments Sun Aug 21 07:10:03 2022 +0000
@@ -256,7 +256,6 @@
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
diff -r cf890d23d4ef -r fdce14a6c62d distrib/sets/descrs
--- a/distrib/sets/descrs Sun Aug 21 07:03:09 2022 +0000
+++ b/distrib/sets/descrs Sun Aug 21 07:10:03 2022 +0000
@@ -512,7 +512,6 @@
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
diff -r cf890d23d4ef -r fdce14a6c62d distrib/sets/makeflist
--- a/distrib/sets/makeflist Sun Aug 21 07:03:09 2022 +0000
+++ b/distrib/sets/makeflist Sun Aug 21 07:10:03 2022 +0000
@@ -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 @@
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 @@
case $_list in
base) lists="${lists} ${nlists}" ;;
x) lists="${lists} ${xlists}" ;;
- ext) lists="${lists} ${extlists}" ;;
esac
done
IFS="${save_IFS}"
@@ -50,9 +48,6 @@
x)
lists="${xlists}"
;;
- y)
- lists="${extlists}"
- ;;
l)
listonly=1
;;
diff -r cf890d23d4ef -r fdce14a6c62d distrib/sets/makeobsolete
--- a/distrib/sets/makeobsolete Sun Aug 21 07:03:09 2022 +0000
+++ b/distrib/sets/makeobsolete Sun Aug 21 07:10:03 2022 +0000
@@ -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 @@
{
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 @@
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 @@
case $_list in
base) lists="${lists} ${nlists}" ;;
x) lists="${lists} ${xlists}" ;;
- ext) lists="${lists} ${extlists}" ;;
esac
done
IFS="${save_IFS}"
@@ -51,9 +49,6 @@
Home |
Main Index |
Thread Index |
Old Index