summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Jorns <ejo@pengutronix.de>2015-06-26 14:18:53 +0200
committerEnrico Jorns <ejo@pengutronix.de>2016-01-22 09:31:42 +0100
commit89ccc18f6b847b04310dd06f76a54cdad3c09f6c (patch)
tree0242b932c29cbcfa8d5cb750be8f59ccad5716fb
parentb7a2e6f2879459c235b000fb44d34ff484de6fa6 (diff)
downloadmeta-ptx-89ccc18f6b847b04310dd06f76a54cdad3c09f6c.tar.gz
meta-ptx-89ccc18f6b847b04310dd06f76a54cdad3c09f6c.tar.xz
ptx: Update distro feature and default to systemd as init manager
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
-rw-r--r--conf/distro/ptx.conf19
1 files changed, 12 insertions, 7 deletions
diff --git a/conf/distro/ptx.conf b/conf/distro/ptx.conf
index 1299dc9..1dcd696 100644
--- a/conf/distro/ptx.conf
+++ b/conf/distro/ptx.conf
@@ -11,12 +11,17 @@ TARGET_VENDOR = "-ptx"
LOCALCONF_VERSION = "1"
-# Override these in poky based distros
-POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland"
-POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
-POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
+# Override these in ptx based distros
+PTX_DEFAULT_DISTRO_FEATURES = "largefile ptest multiarch systemd"
+PTX_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot init-ifupdown"
+PTX_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
+
+DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${PTX_DEFAULT_DISTRO_FEATURES}"
+
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+VIRTUAL-RUNTIME_init_manager = "systemd"
+VIRTUAL-RUNTIME_initscripts = ""
-DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}"
PREFERRED_VERSION_linux-yocto ?= "3.19%"
PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.19%"
@@ -29,8 +34,8 @@ PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.19%"
SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"
SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
-DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
-DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
+DISTRO_EXTRA_RDEPENDS += " ${PTX_DEFAULT_EXTRA_RDEPENDS}"
+DISTRO_EXTRA_RRECOMMENDS += " ${PTX_DEFAULT_EXTRA_RRECOMMENDS}"
POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "packagegroup-core-device-devel",d)}"
DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"