Changes in bsd.subdir.mk

bb75b0d581f74e22a68d7868ad1f5da1146a8de0 - packages: Convert world to a subdir build

Fri, 24 Apr 2026 16:10:01 +0200

packages: Convert world to a subdir buildInstead of driving the world package build from Makefile.inc1,use a subdir build where each package has a subdirectory underpackages/ using the new .Convert some metadata that was previously in the UCL files (e.g.sets and dependencies) to Makefile variables.Build the packages under objdir (not repodir), and use the newstagepackages target to copy them to repodir when creating therepository.Determine an explicit list of packages to build in packages/Makefilebased on enabled src.conf options, and add logic to abort the buildif we attempt to build an empty package. This inverts the previouslogic in Makefile.inc1 which would simply skip empty packages.There are a few advantages to doing it this way:* The package build works more like the rest of the build system, so it's more accessible to developers.* We can customise the packages we build based on src.conf options, e.g. skipping a package entirely, or adjusting its dependencies based on what it actually requires.* We have a specific list of packages that we want to build, and an unexpectedly missing package results in a build error, instead of silently producing a broken repository.* It's possible to build (and in the future, install) an individual package without having to rebuild the entire repository.This doesn't apply to the dtb, kernel-* or src-* packages; thosehave their own build systems in Makefile.inc1 and will be convertedlater.MFC after: 4 weeks (stable/15 only)Reviewed by: jlduran, sjg, brooksSponsored by: https://www.patreon.com/bsdivyDifferential Revision: https://reviews.freebsd.org/D56087 List of files: /freebsd/share/mk/bsd.subdir.mk

3717484168eea22f318658d46b1d59257c0cce4d - bsd.subdir.mk skip _SUBDIR for DIRDEPS_BUILD

Mon, 21 Jul 2025 18:11:44 +0200

bsd.subdir.mk skip _SUBDIR for DIRDEPS_BUILDFor DIRDEPS_BUILD we want to ignore _SUBDIR regardless of.MAKE.LEVELReviewed by: stevekDifferential Revision: https://reviews.freebsd.org/D51454 List of files: /freebsd/share/mk/bsd.subdir.mk

cf5f0744cd1df70f92959710bdf2a88c9f9c7df7 - Add .NOTMAIN to guard targets

Sat, 19 Apr 2025 21:57:41 +0200

Add .NOTMAIN to guard targetsAvoid make mistaking a guard target for the .MAIN one. List of files: /freebsd/share/mk/bsd.subdir.mk

b571bcea5495327fd210378109b0b2aed08bebc3 - bsd.subdir.mk: improve `SUBDIR.${MK_FOO}` advice

Sun, 21 Apr 2024 18:27:48 +0200

bsd.subdir.mk: improve `SUBDIR.${MK_FOO}` advice- Remove superfluous whitespace by removing trailing whitespace before `\` (line continuation character)- Quote `SUBDIR.` to clarify the fact that this is a variable reference--not the end of a sentence. List of files: /freebsd/share/mk/bsd.subdir.mk

fbae308319b7678cd9d879f60b1efd8d4c99b5eb - bsd.subdir.mk: Drop broken optimisation for realinstall parallelisation

Fri, 02 Feb 2024 22:17:23 +0100

bsd.subdir.mk: Drop broken optimisation for realinstall parallelisationNot all of the tree is happy for realinstall to be done in parallel. Inparticular, Makefile.inc1 uses .WAIT to force etc to be installed afterearlier subdirectories, since etc calls into share/man's makedb to runmakewhatis on the tree and needs all manpages to have been installed.Also, libexec/Makefile doesn't set SUBDIR_PARALLEL, and the link fromld-elf32.1 to ld-elf.1 relies on rtld-elf having been installed beforertld-elf32, otherwise creating the link will fail.In general, core behavioural differences like this between NO_ROOT and"normal" builds are also dangerous and confusing.If this optimisation is deemed important, it should be reintroduced in amore limited and robust manner that doesn't break the above situations.Until then value correctness over slight efficiency gains on high corecount machines, the same machines where you're more likely to encounterissues from this optimisation.This reverts commits cd19ecdbdc87 ("Similar to r296013 for NO_ROOT,force SUBDIR_PARALLEL for buildworld WORLDTMP staging.") andb9c6f3168112 ("Add more STANDALONE_SUBDIR_TARGETS.").Found by: CheriBSD JenkinsReviewed by: bdrewery, brooksFixes: cd19ecdbdc87 ("Similar to r296013 for NO_ROOT, force SUBDIR_PARALLEL for buildworld WORLDTMP staging.")Fixes: b9c6f3168112 ("Add more STANDALONE_SUBDIR_TARGETS.")MFC after: 1 weekDifferential Revision: https://reviews.freebsd.org/D43705 List of files: /freebsd/share/mk/bsd.subdir.mk

97759ccc715c4b365432c16d763c50eecfcb1100 - share: Remove ancient SCCS tags.

Thu, 23 Nov 2023 18:21:37 +0100

share: Remove ancient SCCS tags.Remove ancient SCCS tags from the tree, automated scripting, with twominor fixup to keep things compiling. All the common forms in the treewere removed with a perl script.Sponsored by: Netflix List of files: /freebsd/share/mk/bsd.subdir.mk

d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf - Remove $FreeBSD$: one-line sh pattern

Wed, 16 Aug 2023 19:55:03 +0200

Remove $FreeBSD$: one-line sh patternRemove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ List of files: /freebsd/share/mk/bsd.subdir.mk

c07be2c53e5ce64a2ce79ddfbc3e12e694a0825a - make: Don't print as many ==> and -- xxx -- lines in meta mode

Fri, 28 Oct 2022 23:42:49 +0200

make: Don't print as many ==> and -- xxx -- lines in meta modeSince metamode just announces what it's doing, the extra -- xxx -- linesaren't needed for recursive descent, nor are the ==> lines needed. Thisspeeds up rebuilding kernels a lot...Sponsored by: NetflixReviewed by: sjg, bdreweryDifferential Revision: https://reviews.freebsd.org/D37071 List of files: /freebsd/share/mk/bsd.subdir.mk

b58ea3e1f7779aac4eebcec5dffc9ebef203e583 - Fix hand-rolled METALOG entries for installconfig during distributeworld

Mon, 28 Feb 2022 23:36:39 +0100

Fix hand-rolled METALOG entries for installconfig during distributeworldDuring distributeworld we call distribute on subdirectories, which inturn calls installconfig. However, this recursive installconfig callappends the distribution name (in these cases, "base") to DESTDIR. Forinstall(1) this works fine as its -D argument comes from the top-levelMakefile.inc1, which passes the original DESTDIR, thereby resulting inthe METALOG entry having the distribution name as a prefix representingits true installed path relative to the root, but for the hand-rolledentries they do not use install(1) and thus do not have access to whatthe original DESTDIR was, resulting in the METALOG missing this prefix.Thus, pass down the name of the distribution via a new variable DISTBASE(chosen as Makefile.inc1 already uses that to convey this exact sameinformation to etc's distrib-dirs during distributeworld) and prependthis to the handful of manually-generated METALOG entries. For theinstallworld case this variable will be empty and so this behaves asbefore.Note that we need to be careful to avoid double slashes in the METALOG;distributeworld uses find | awk to split the single METALOG up intomultiple dist.meta files, and this relies on the paths in the METALOGhaving the exact prefix ./dist (or ./dist/usr/lib/debug).Reviewed by: brooks, emasteDifferential Revision: https://reviews.freebsd.org/D33997 List of files: /freebsd/share/mk/bsd.subdir.mk

02e65672b4071abde68c7163d272b8cd53003eca - Add a guard for broken SUBDIR.${MK_FOO} use

Mon, 16 Nov 2020 20:15:11 +0100

Add a guard for broken SUBDIR.${MK_FOO} useCheck for the variable SUBDIR. and error as it usually means someoneforgot to include src.opts.mk.This guard from CheriBSD found the bugs in r367655 and r367728.Reviewed by: bdrewery, arichardsonObtained from: CheriBSDSponsored by: DARPADifferential Revision: https://reviews.freebsd.org/D27211 List of files: /freebsd/share/mk/bsd.subdir.mk

2e1dfb346f1e3dd08eff70b5d4478c9f811084b2 - Support SUBDIR.${MK_FOO}.${MK_BAR} expresssions.

Tue, 17 Mar 2020 19:17:32 +0100

Support SUBDIR.${MK_FOO}.${MK_BAR} expresssions.This allows simplification of Makefiles where some SUBDIR entries dependon two things (e.g. something that depends on C++ and some other knob).Discussed with: imp, jhbObtained from: CheriBSDMFC after: 3 daysSponsored by: DARPA List of files: /freebsd/share/mk/bsd.subdir.mk

01d4e2149e5566e5d9394913dc9fb032da259e0b - MFH r338661 through r339200.

Fri, 05 Oct 2018 19:53:47 +0200

MFH r338661 through r339200.Sponsored by: The FreeBSD Foundation List of files: /freebsd/share/mk/bsd.subdir.mk

ce44d808538c6e32a86b2d79302418d17b28a854 - Merge ^/head r338731 through r338987.

Thu, 27 Sep 2018 22:00:07 +0200

Merge ^/head r338731 through r338987. List of files: /freebsd/share/mk/bsd.subdir.mk

ebd2a66265be8a19ada02031d9d543d7752cdec9 - installdirs can be a recursive/standalone target.

Tue, 18 Sep 2018 00:15:09 +0200

installdirs can be a recursive/standalone target.Sponsored by: Dell EMCApproved by: re (gjb) List of files: /freebsd/share/mk/bsd.subdir.mk

937d37fc6c80b2171091fc773eb40bab53d84648 - Merge ^/head r325842 through r325998.

Sun, 19 Nov 2017 13:36:03 +0100

Merge ^/head r325842 through r325998. List of files: /freebsd/share/mk/bsd.subdir.mk

1cbb58886a477cf282072eaa331d8122e36e9952 - Remove build system support for lint.

Fri, 17 Nov 2017 19:16:46 +0100

Remove build system support for lint.Differential Revision: https://reviews.freebsd.org/D13124 List of files: /freebsd/share/mk/bsd.subdir.mk

c2c014f24c10f90d85126ac5fbd4d8524de32b1c - Merge ^/head r323559 through r325504.

Tue, 07 Nov 2017 09:39:14 +0100

Merge ^/head r323559 through r325504. List of files: /freebsd/share/mk/bsd.subdir.mk

f6e116eea97e79450fb8dcf81193f35dfc30fae1 - MFhead@r325383

Sat, 04 Nov 2017 08:05:21 +0100

MFhead@r325383 List of files: /freebsd/share/mk/bsd.subdir.mk

f8b15066f2a6a3ab22570343712969dc68873c6a - make obj: Skip treewalk if AUTO_OBJ is enabled.

Wed, 01 Nov 2017 22:22:16 +0100

make obj: Skip treewalk if AUTO_OBJ is enabled.Sponsored by: Dell EMC Isilon List of files: /freebsd/share/mk/bsd.subdir.mk

531c2d7af3cd2e64eec94aa1b19c4b2f16fce515 - MFhead@r320180

Mon, 24 Jul 2017 20:02:13 +0200

MFhead@r320180 List of files: /freebsd/share/mk/bsd.subdir.mk