mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-17 15:34:18 +08:00
Fallback to generic config when arch specific config doesn't exist
Most configs are entirely identical between architectures, so this fallback reduces the amount of config files by a lot.
This commit is contained in:
bjorn3
parent
512e46e914
commit
dc4e3d2c96
@ -1,3 +0,0 @@
|
||||
# Configuration for "acid" testing
|
||||
|
||||
include = ["../acid.toml"]
|
||||
@ -1,3 +0,0 @@
|
||||
# Configuration for automated testing of essential test suites
|
||||
|
||||
include = ["../auto-test.toml"]
|
||||
@ -1,14 +0,0 @@
|
||||
# Minimal desktop configuration
|
||||
|
||||
include = ["../desktop-minimal.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Default build system configuration
|
||||
|
||||
include = ["../desktop.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Minimal configuration
|
||||
|
||||
include = ["../minimal.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Configuration for "os-test" testing
|
||||
|
||||
include = ["../os-test.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Server configuration
|
||||
|
||||
include = ["../server.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Configuration for testing
|
||||
|
||||
include = ["../tests.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 10000
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,3 +0,0 @@
|
||||
# Configuration for "acid" testing
|
||||
|
||||
include = ["../acid.toml"]
|
||||
@ -1,3 +0,0 @@
|
||||
# Configuration for automated testing of essential test suites
|
||||
|
||||
include = ["../auto-test.toml"]
|
||||
@ -1,14 +0,0 @@
|
||||
# Minimal desktop configuration
|
||||
|
||||
include = ["../desktop-minimal.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Default build system configuration
|
||||
|
||||
include = ["../desktop.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Minimal configuration
|
||||
|
||||
include = ["../minimal.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Configuration for "os-test" testing
|
||||
|
||||
include = ["../os-test.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Server configuration
|
||||
|
||||
include = ["../server.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Configuration for testing
|
||||
|
||||
include = ["../tests.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 10000
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,3 +0,0 @@
|
||||
# Configuration for "acid" testing
|
||||
|
||||
include = ["../acid.toml"]
|
||||
@ -1,3 +0,0 @@
|
||||
# Configuration for automated testing of essential test suites
|
||||
|
||||
include = ["../auto-test.toml"]
|
||||
@ -1,14 +0,0 @@
|
||||
# Minimal desktop configuration
|
||||
|
||||
include = ["../desktop-minimal.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Minimal configuration
|
||||
|
||||
include = ["../minimal.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Configuration for "os-test" testing
|
||||
|
||||
include = ["../os-test.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Server configuration
|
||||
|
||||
include = ["../server.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Configuration for testing
|
||||
|
||||
include = ["../tests.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 10000
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,3 +0,0 @@
|
||||
# Configuration for "acid" testing
|
||||
|
||||
include = ["../acid.toml"]
|
||||
@ -1,3 +0,0 @@
|
||||
# Configuration for automated testing of essential test suites
|
||||
|
||||
include = ["../auto-test.toml"]
|
||||
@ -1,14 +0,0 @@
|
||||
# Minimal desktop configuration
|
||||
|
||||
include = ["../desktop-minimal.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Default build system configuration
|
||||
|
||||
include = ["../desktop.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Configuration for development
|
||||
|
||||
include = ["../dev.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Minimal configuration
|
||||
|
||||
include = ["../minimal.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Configuration for "os-test" testing
|
||||
|
||||
include = ["../os-test.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Server configuration
|
||||
|
||||
include = ["../server.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 1024
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,14 +0,0 @@
|
||||
# Configuration for testing
|
||||
|
||||
include = ["../tests.toml"]
|
||||
|
||||
# Override the default settings here
|
||||
|
||||
# General settings
|
||||
[general]
|
||||
# Filesystem size in MiB
|
||||
# filesystem_size = 10000
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
# example = {}
|
||||
@ -1,3 +0,0 @@
|
||||
# Wayland configuration
|
||||
|
||||
include = ["../wayland.toml"]
|
||||
@ -1,3 +0,0 @@
|
||||
# X11 configuration
|
||||
|
||||
include = ["../x11.toml"]
|
||||
@ -32,7 +32,11 @@ ifeq ($(ARCH),i686)
|
||||
endif
|
||||
## Select filesystem config
|
||||
ifeq ($(BOARD),)
|
||||
ifeq ($(wildcard config/$(ARCH)/$(CONFIG_NAME).toml),)
|
||||
FILESYSTEM_CONFIG?=config/$(CONFIG_NAME).toml
|
||||
else
|
||||
FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml
|
||||
endif
|
||||
else
|
||||
FILESYSTEM_CONFIG?=config/$(ARCH)/$(BOARD)/$(CONFIG_NAME).toml
|
||||
endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user