diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 11:53:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-29 15:15:47 +0100 |
| commit | ef967c70182eeccb59c7511d838a7ecb0b2315c1 (patch) | |
| tree | fd801c62907115b9e8377f835ff4eb688e0c6bb2 /meta/recipes-connectivity | |
| parent | b7ab82485e4514e07ab8a76e554da27ddc92e6c0 (diff) | |
| download | openembedded-core-ef967c70182eeccb59c7511d838a7ecb0b2315c1.tar.gz openembedded-core-ef967c70182eeccb59c7511d838a7ecb0b2315c1.tar.bz2 openembedded-core-ef967c70182eeccb59c7511d838a7ecb0b2315c1.zip | |
classes/meta: Add DISTRO_FEATURES check for gtk+/gtk3+
If you currently do a DISTRO_FEATURES_remove = "x11" with OE-Core, you
see failures due to dependency problems. The work in resolving this was
partially completed a while back. This adds in the markup mainly for
gtk/gtk3+ recipes and means "bitbake world" will work successfully.
Rather than code the gtk/gtk+ specific distro features into each recipe,
a shared variable is used.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome_0.7.bb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb index eea4d70fab..0d42b90e71 100644 --- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ require avahi.inc -inherit python-dir pythonnative +inherit python-dir pythonnative distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" PACKAGECONFIG ??= "python" PACKAGECONFIG[python] = "--enable-python,--disable-python,python-native python" diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index f5575d2938..0fd1c65a3b 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb @@ -19,7 +19,8 @@ SRC_URI = "git://github.com/connectivity/connman-gnome.git \ S = "${WORKDIR}/git" -inherit autotools-brokensep gtk-icon-cache pkgconfig +inherit autotools-brokensep gtk-icon-cache pkgconfig distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" RDEPENDS_${PN} = "connman" |