summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Wesp <n.wesp@phytec.de>2019-11-13 13:16:22 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2019-11-15 14:36:36 (GMT)
commitae5a238d3bc5eede3ba2fe159443bc066f6d1932 (patch)
treec021906d38c4846e940d7aea8921f4b6b4038218
parent64c360d5aaf42b8e9ce73da06314edab8356ad5c (diff)
downloadmeta-yogurt-ae5a238d3bc5eede3ba2fe159443bc066f6d1932.zip
meta-yogurt-ae5a238d3bc5eede3ba2fe159443bc066f6d1932.tar.bz2
conf: distro: manage distros hierarchically
To understand our distros easier, we will manage them hierarchically. Now the base distro is 'yogurt'. Every other yogurt distro (except yogurt-tiny) now requires (includes) yogurt.conf and add/remove needed/unneeded features. Furthermore wayland has been dropped from base yogurt distro, as this feature is in yogurt-wayland. In addition I added 'Secure' to DISTRO_NAME at yogurt-secure.conf Signed-off-by: Norbert Wesp <n.wesp@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/distro/yogurt-ci.conf6
-rw-r--r--conf/distro/yogurt-gateway.conf2
-rw-r--r--conf/distro/yogurt-rt.conf6
-rw-r--r--conf/distro/yogurt-secure.conf9
-rw-r--r--conf/distro/yogurt-vendor-wayland.conf2
-rw-r--r--conf/distro/yogurt-vendor-xwayland.conf2
-rw-r--r--conf/distro/yogurt-vendor.conf7
-rw-r--r--conf/distro/yogurt-wayland.conf6
-rw-r--r--conf/distro/yogurt.conf6
9 files changed, 15 insertions, 31 deletions
diff --git a/conf/distro/yogurt-ci.conf b/conf/distro/yogurt-ci.conf
index 7773bae..dc4d707 100644
--- a/conf/distro/yogurt-ci.conf
+++ b/conf/distro/yogurt-ci.conf
@@ -1,12 +1,8 @@
-require conf/distro/poky.conf
-require common.inc
+require yogurt.conf
DISTRO = "yogurt-ci"
DISTRO_NAME = "Yogurt CI (Phytec CI Builds)"
-DISTRO_FEATURES += "systemd"
-DISTRO_FEATURES_remove = "argp irda pcmcia zeroconf x11 ptest multiarch vulkan wayland"
-
PREFERRED_VERSION_linux-mainline_mx6ul = "4.19.y-phy%"
PREFERRED_VERSION_barebox = "master%"
SRCREV_pn-barebox = "${AUTOREV}"
diff --git a/conf/distro/yogurt-gateway.conf b/conf/distro/yogurt-gateway.conf
index 8c99885..4a954af 100644
--- a/conf/distro/yogurt-gateway.conf
+++ b/conf/distro/yogurt-gateway.conf
@@ -1,4 +1,4 @@
-require yogurt.conf
+require yogurt-wayland.conf
DISTRO = "yogurt-gateway"
DISTRO_NAME = "Yogurt Gateway (Phytec Gateway Distribution)"
diff --git a/conf/distro/yogurt-rt.conf b/conf/distro/yogurt-rt.conf
index d9d7975..8594b41 100644
--- a/conf/distro/yogurt-rt.conf
+++ b/conf/distro/yogurt-rt.conf
@@ -1,8 +1,6 @@
-require conf/distro/poky.conf
-require common.inc
+require yogurt.conf
DISTRO = "yogurt-rt"
DISTRO_NAME = "Yogurt PREEMPT-RT (Phytec PREEMPT-RT Distribution)"
-DISTRO_FEATURES += "systemd preempt-rt"
-DISTRO_FEATURES_remove = "argp irda pcmcia zeroconf x11 ptest multiarch wayland"
+DISTRO_FEATURES += "preempt-rt"
diff --git a/conf/distro/yogurt-secure.conf b/conf/distro/yogurt-secure.conf
index 837e231..7f04a63 100644
--- a/conf/distro/yogurt-secure.conf
+++ b/conf/distro/yogurt-secure.conf
@@ -1,12 +1,7 @@
-require conf/distro/poky.conf
-require common.inc
+require yogurt.conf
DISTRO = "yogurt-secure"
-DISTRO_NAME = "Yogurt (Phytec Base Secure Distribution)"
-
-DISTRO_FEATURES += "systemd"
-DISTRO_FEATURES_remove = "argp irda pcmcia zeroconf x11 ptest multiarch vulkan"
-DISTRO_FEATURES_remove_mx6ul = "opengl"
+DISTRO_NAME = "Yogurt Secure (Phytec Base Secure Distribution)"
#add secure boot to the Distro
DISTRO_FEATURES += "secureboot"
diff --git a/conf/distro/yogurt-vendor-wayland.conf b/conf/distro/yogurt-vendor-wayland.conf
index a3d9064..d8e44c5 100644
--- a/conf/distro/yogurt-vendor-wayland.conf
+++ b/conf/distro/yogurt-vendor-wayland.conf
@@ -1,3 +1,3 @@
require yogurt-vendor.conf
-DISTRO_FEATURES += "wayland vulkan opengl"
+DISTRO_FEATURES += "wayland vulkan"
diff --git a/conf/distro/yogurt-vendor-xwayland.conf b/conf/distro/yogurt-vendor-xwayland.conf
index b623b29..74e5c25 100644
--- a/conf/distro/yogurt-vendor-xwayland.conf
+++ b/conf/distro/yogurt-vendor-xwayland.conf
@@ -1,5 +1,5 @@
require yogurt-vendor.conf
-DISTRO_FEATURES += "x11 wayland vulkan opengl"
+DISTRO_FEATURES += "x11 wayland vulkan"
PREFERRED_VERSION_opencv_mx8 = "3.%"
diff --git a/conf/distro/yogurt-vendor.conf b/conf/distro/yogurt-vendor.conf
index b6bcfa7..8d9001d 100644
--- a/conf/distro/yogurt-vendor.conf
+++ b/conf/distro/yogurt-vendor.conf
@@ -1,11 +1,8 @@
-require conf/distro/poky.conf
-require common.inc
+require yogurt.conf
DISTRO = "yogurt-vendor"
DISTRO_NAME = "Yogurt Vendor (Phytec Vendor Distribution)"
-DISTRO_FEATURES_DEFAULT_remove = "argp irda pcmcia x11"
-DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
-DISTRO_FEATURES += "pam systemd vendor"
+DISTRO_FEATURES += "pam vendor"
PREFERRED_PROVIDER_virtual/kernel_mx6ul = "linux-imx"
diff --git a/conf/distro/yogurt-wayland.conf b/conf/distro/yogurt-wayland.conf
index 36a825a..4284b9d 100644
--- a/conf/distro/yogurt-wayland.conf
+++ b/conf/distro/yogurt-wayland.conf
@@ -1,8 +1,6 @@
-require conf/distro/poky.conf
-require common.inc
+require yogurt.conf
DISTRO = "yogurt-wayland"
DISTRO_NAME = "Yogurt Wayland (Phytec Wayland Distribution)"
-DISTRO_FEATURES += "systemd"
-DISTRO_FEATURES_remove = "argp irda pcmcia x11 ptest vulkan"
+DISTRO_FEATURES += "wayland"
diff --git a/conf/distro/yogurt.conf b/conf/distro/yogurt.conf
index b77d24b..ff38ca9 100644
--- a/conf/distro/yogurt.conf
+++ b/conf/distro/yogurt.conf
@@ -4,6 +4,6 @@ require common.inc
DISTRO = "yogurt"
DISTRO_NAME = "Yogurt (Phytec Base Distribution)"
-DISTRO_FEATURES += "systemd"
-DISTRO_FEATURES_remove = "argp irda pcmcia zeroconf x11 ptest multiarch vulkan"
-DISTRO_FEATURES_remove_mx6ul = "opengl wayland"
+DISTRO_FEATURES_DEFAULT_remove = "argp irda pcmcia zeroconf x11"
+DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} opengl systemd"
+DISTRO_FEATURES_remove_mx6ul = "opengl"