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-sato | |
| 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-sato')
| -rw-r--r-- | meta/recipes-sato/gtk-engines/gtk-sato-engine.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc b/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc index 4e37ff2047..fa6b2b2e75 100644 --- a/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc +++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc @@ -8,6 +8,9 @@ SECTION = "x11/base" DEPENDS = "gtk+" RDEPENDS_gtk-theme-sato = "gtk-sato-engine" +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + PACKAGES += "gtk-theme-sato" FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so " FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*.la" diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb index 91fd150e3b..c8cbd57a6e 100644 --- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb @@ -15,4 +15,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN}" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check + +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" |