From ba6d3ebd8d12e38f22371aca5a744ceb11268fac Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 2 Oct 2011 14:39:53 -0500 Subject: [PATCH] docs/spec: spec out configuration overlays and precedence --- docs/spec | 7 +++++++ targets/amd64/config/.keep | 0 targets/config/.keep | 0 targets/i386/config/.keep | 0 worlds/amd64/config/.keep | 0 worlds/config/.keep | 0 worlds/i386/config/.keep | 0 7 files changed, 7 insertions(+) create mode 100644 targets/amd64/config/.keep create mode 100644 targets/config/.keep create mode 100644 targets/i386/config/.keep create mode 100644 worlds/amd64/config/.keep create mode 100644 worlds/config/.keep create mode 100644 worlds/i386/config/.keep diff --git a/docs/spec b/docs/spec index 232d47a..404834a 100644 --- a/docs/spec +++ b/docs/spec @@ -14,14 +14,20 @@ script/ - Build scripts push - Push source tree to build server (requires net/rsync) src/ - Going away targets/ - Contains system targets (world, ports, runtime config) + config/ - Generic configuration for all targets amd64/ - Arch-specific targets + config/ - Generic configuration for all amd64 targets GENERIC/ - Generic target, relies on worlds/amd64/GENERIC i386/ - Arch-specific targets + config/ - Generic configuration for all i386 targets GENERIC/ - Generic target, relies on worlds/i386/GENERIC worlds/ - Contains worlds (config and root tree of a given base system build) + config/ - Generic configuration for all worlds amd64/ - Arch-specific worlds + config/ - Generic configuration for all amd64 worlds GENERIC/ - Generic world (Empty src.conf, GENERIC kernel config file) i386/ - Arch-specific worlds + config/ - Generic configuration for all i386 worlds GENERIC/ - Generic world (Empty src.conf, GENERIC kernel config file) seed/ - Contains seed builds for building a world base/ - Location of base tarballs @@ -30,6 +36,7 @@ seed/ - Contains seed builds for building a world distfiles/ - Distfile tarballs for port builds Makefile - Makefile to build it all +Files in config directories are overlaid completely, and are not merged nor successively applied. For instance, a file with the same name in targets/amd64/config will cause the file in targets/config to be ignored; likewise for a file in targets/amd64/GENERIC/config. seed/ is used to seed the initial chroot for building a world. diff --git a/targets/amd64/config/.keep b/targets/amd64/config/.keep new file mode 100644 index 0000000..e69de29 diff --git a/targets/config/.keep b/targets/config/.keep new file mode 100644 index 0000000..e69de29 diff --git a/targets/i386/config/.keep b/targets/i386/config/.keep new file mode 100644 index 0000000..e69de29 diff --git a/worlds/amd64/config/.keep b/worlds/amd64/config/.keep new file mode 100644 index 0000000..e69de29 diff --git a/worlds/config/.keep b/worlds/config/.keep new file mode 100644 index 0000000..e69de29 diff --git a/worlds/i386/config/.keep b/worlds/i386/config/.keep new file mode 100644 index 0000000..e69de29 -- 2.45.0