summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2016-08-23 09:36:23 -0700
committerReinette Chatre <reinette.chatre@intel.com>2016-09-07 12:29:33 -0700
commit936c14007d72e35756c8e14ef2bdd40908ce9465 (patch)
tree0db584e46ef1b2cf3c886ec2426f8a036c71ba2f
parent1ea8a9a8e9f1e096fec80da8f4ad6aea9379a424 (diff)
downloadmeta-systemdev-936c14007d72e35756c8e14ef2bdd40908ce9465.tar.gz
meta-systemdev-936c14007d72e35756c8e14ef2bdd40908ce9465.tar.bz2
meta-systemdev-936c14007d72e35756c8e14ef2bdd40908ce9465.zip
systemdev.conf: fixup incompatibility when using X11 from meta-oe
With the usage of meta-oe the build will use xserver-common as a replacement for x11-common as we see during rootfs generation: "Multiple replacers for x11-common, using first one (xserver-common)" With the installation of xserver-common instead of x11-common we then get see an image creation failure because the dependency of packagegroup-core-x11-utils-dev on x11-common cannot be satisfied: * satisfy_dependencies_for: Cannot satisfy the following dependencies for packagegroup-core-x11-utils-dev: * x11-common (= 0.1-r47) * By setting VIRTUAL-RUNTIME_xserver_common we ensure that packagegroup-core-x11-utils-dev depends on what will be installed. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Reviewed-by: Joe Konno <joe.konno@intel.com> Acked-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--conf/distro/systemdev.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/distro/systemdev.conf b/conf/distro/systemdev.conf
index d4ae96c..4631b57 100644
--- a/conf/distro/systemdev.conf
+++ b/conf/distro/systemdev.conf
@@ -21,6 +21,7 @@ DISTRO_FEATURES_append = " systemd pam wayland"
VIRTUAL-RUNTIME_init_manager = "systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
VIRTUAL-RUNTIME_initscripts = ""
+VIRTUAL-RUNTIME_xserver_common = "xserver-common"
DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${SYSTEMDEV_DEFAULT_DISTRO_FEATURES}"