summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Müller-Klieser <S.Mueller-Klieser@phytec.de>2019-04-05 14:19:50 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2019-04-09 15:21:58 (GMT)
commitd8e6f060b54b780362fce4474940f7df420ac354 (patch)
treef6d4a744397f64bc73cb138ca2c148527d2172ee
parent767f9a5ae883b6fe52bad26de47448e7b13b35fe (diff)
downloadmeta-yogurt-d8e6f060b54b780362fce4474940f7df420ac354.zip
meta-yogurt-d8e6f060b54b780362fce4474940f7df420ac354.tar.bz2
distros: move more settings to common.inc
All distros are better in sync now. Only drawback is yogurt-tiny, which needs a double overwrite. This seems acceptable. Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/distro/common.inc13
-rw-r--r--conf/distro/yogurt-ci.conf13
-rw-r--r--conf/distro/yogurt-rt.conf10
-rw-r--r--conf/distro/yogurt-tiny.conf9
-rw-r--r--conf/distro/yogurt-vendor.conf10
-rw-r--r--conf/distro/yogurt-wayland.conf10
-rw-r--r--conf/distro/yogurt.conf13
7 files changed, 22 insertions, 56 deletions
diff --git a/conf/distro/common.inc b/conf/distro/common.inc
index f56dc67..4036610 100644
--- a/conf/distro/common.inc
+++ b/conf/distro/common.inc
@@ -56,3 +56,16 @@ WARN_QA_append = " ${ERROR_TO_WARN_QA}"
# suppress meta-virtualization useless warning when building
# without virtualization distro feature
SKIP_META_VIRT_SANITY_CHECK = "1"
+
+VIRTUAL-RUNTIME_dev_manager = "udev"
+VIRTUAL-RUNTIME_init_manager = "systemd"
+DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
+VIRTUAL-RUNTIME_login_manager = "busybox"
+VIRTUAL-RUNTIME_syslog = ""
+VIRTUAL-RUNTIME_initscripts = ""
+
+# some default locales
+IMAGE_LINGUAS ?= "de-de fr-fr en-us"
+
+PREFERRED_VERSION_mraa = "2.0.%"
+PREFERRED_VERSION_upm = "1.7.%"
diff --git a/conf/distro/yogurt-ci.conf b/conf/distro/yogurt-ci.conf
index 424edaa..3dcf277 100644
--- a/conf/distro/yogurt-ci.conf
+++ b/conf/distro/yogurt-ci.conf
@@ -7,19 +7,6 @@ DISTRO_NAME = "Yogurt CI (Phytec CI Builds)"
DISTRO_FEATURES += "systemd"
DISTRO_FEATURES_remove = "argp irda pcmcia zeroconf x11 ptest multiarch vulkan wayland"
-VIRTUAL-RUNTIME_dev_manager = "udev"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
-VIRTUAL-RUNTIME_login_manager = "busybox"
-VIRTUAL-RUNTIME_syslog = ""
-VIRTUAL-RUNTIME_initscripts = ""
-
-# some default locales
-IMAGE_LINGUAS ?= "de-de fr-fr en-us"
-
-PREFERRED_VERSION_mraa = "2.0.%"
-PREFERRED_VERSION_upm = "1.7.%"
-
PREFERRED_VERSION_virtual/kernel_mx6ul = "4.14.y"
PREFERRED_VERSION_virtual/bootloader = "master"
SRCREV_pn-barebox = "${AUTOREV}"
diff --git a/conf/distro/yogurt-rt.conf b/conf/distro/yogurt-rt.conf
index 13879c0..d9d7975 100644
--- a/conf/distro/yogurt-rt.conf
+++ b/conf/distro/yogurt-rt.conf
@@ -6,13 +6,3 @@ 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"
-
-VIRTUAL-RUNTIME_dev_manager = "udev"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
-VIRTUAL-RUNTIME_login_manager = "busybox"
-VIRTUAL-RUNTIME_syslog = ""
-VIRTUAL-RUNTIME_initscripts = ""
-
-# some default locales
-IMAGE_LINGUAS ?= "de-de fr-fr en-us"
diff --git a/conf/distro/yogurt-tiny.conf b/conf/distro/yogurt-tiny.conf
index a1fdce6..4f02e78 100644
--- a/conf/distro/yogurt-tiny.conf
+++ b/conf/distro/yogurt-tiny.conf
@@ -14,3 +14,12 @@ PREFERRED_PROVIDER_virtual/kernel_rk3288 = "linux-mainline"
PNBLACKLIST[phytec-headless-image] = "not buildable with yogurt-tiny use core-image-minimal"
PNBLACKLIST[phytec-qt5demo-image] = "not buildable with yogurt-tiny use core-image-minimal"
+
+# common.inc overwrites poky-tiny settings, so we have to revert this to upstream
+# poky-tiny
+VIRTUAL-RUNTIME_dev_manager = "busybox-mdev"
+VIRTUAL-RUNTIME_login_manager = "busybox"
+VIRTUAL-RUNTIME_init_manager = "busybox"
+VIRTUAL-RUNTIME_initscripts = "initscripts"
+VIRTUAL-RUNTIME_keymaps = "keymaps"
+DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
diff --git a/conf/distro/yogurt-vendor.conf b/conf/distro/yogurt-vendor.conf
index 34e15cc..3ee4e90 100644
--- a/conf/distro/yogurt-vendor.conf
+++ b/conf/distro/yogurt-vendor.conf
@@ -7,14 +7,4 @@ DISTRO_NAME = "Yogurt Vendor (Phytec Vendor Distribution)"
DISTRO_FEATURES += "systemd vendor"
DISTRO_FEATURES_remove = "argp irda pcmcia x11 ptest vulkan"
-VIRTUAL-RUNTIME_dev_manager = "udev"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
-VIRTUAL-RUNTIME_login_manager = "busybox"
-VIRTUAL-RUNTIME_syslog = ""
-VIRTUAL-RUNTIME_initscripts = ""
-
-# some default locales
-IMAGE_LINGUAS ?= "de-de fr-fr en-us"
-
PREFERRED_PROVIDER_virtual/kernel_mx6ul = "linux-imx"
diff --git a/conf/distro/yogurt-wayland.conf b/conf/distro/yogurt-wayland.conf
index b72a65a..36a825a 100644
--- a/conf/distro/yogurt-wayland.conf
+++ b/conf/distro/yogurt-wayland.conf
@@ -6,13 +6,3 @@ DISTRO_NAME = "Yogurt Wayland (Phytec Wayland Distribution)"
DISTRO_FEATURES += "systemd"
DISTRO_FEATURES_remove = "argp irda pcmcia x11 ptest vulkan"
-
-VIRTUAL-RUNTIME_dev_manager = "udev"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
-VIRTUAL-RUNTIME_login_manager = "busybox"
-VIRTUAL-RUNTIME_syslog = ""
-VIRTUAL-RUNTIME_initscripts = ""
-
-# some default locales
-IMAGE_LINGUAS ?= "de-de fr-fr en-us"
diff --git a/conf/distro/yogurt.conf b/conf/distro/yogurt.conf
index 29cab41..1058ae9 100644
--- a/conf/distro/yogurt.conf
+++ b/conf/distro/yogurt.conf
@@ -7,16 +7,3 @@ DISTRO_NAME = "Yogurt (Phytec Base Distribution)"
DISTRO_FEATURES += "systemd"
DISTRO_FEATURES_remove = "argp irda pcmcia zeroconf x11 ptest multiarch vulkan wayland"
DISTRO_FEATURES_remove_mx6ul = "opengl"
-
-VIRTUAL-RUNTIME_dev_manager = "udev"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
-VIRTUAL-RUNTIME_login_manager = "busybox"
-VIRTUAL-RUNTIME_syslog = ""
-VIRTUAL-RUNTIME_initscripts = ""
-
-# some default locales
-IMAGE_LINGUAS ?= "de-de fr-fr en-us"
-
-PREFERRED_VERSION_mraa = "2.0.%"
-PREFERRED_VERSION_upm = "1.7.%"