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-kernel | |
| parent | b7ab82485e4514e07ab8a76e554da27ddc92e6c0 (diff) | |
| download | openembedded-core-contrib-ef967c70182eeccb59c7511d838a7ecb0b2315c1.tar.gz | |
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-kernel')
| -rw-r--r-- | meta/recipes-kernel/oprofile/oprofileui_git.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/sysprof/sysprof_git.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-kernel/trace-cmd/kernelshark_git.bb | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/meta/recipes-kernel/oprofile/oprofileui_git.bb index bb69d5404d..8fad099664 100644 --- a/meta/recipes-kernel/oprofile/oprofileui_git.bb +++ b/meta/recipes-kernel/oprofile/oprofileui_git.bb @@ -2,6 +2,9 @@ require oprofileui.inc DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf" +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + SRCREV = "389e1875af4721d52c7e65cf9cfffb69b0ed6a59" PV = "0.0+git${SRCPV}" diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb index 19c3e10f7c..7d87efe7db 100644 --- a/meta/recipes-kernel/sysprof/sysprof_git.bb +++ b/meta/recipes-kernel/sysprof/sysprof_git.bb @@ -19,7 +19,8 @@ SRC_URI_append_mips64n32 = " file://rmb-mips.patch" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" # We do not yet work for aarch64. # diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb index 9deccaefd9..563182c89f 100644 --- a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb +++ b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb @@ -9,6 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ DEPENDS = "gtk+ libxml2" RDEPENDS_${PN} = "trace-cmd" +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + EXTRA_OEMAKE = "\ 'prefix=${prefix}' \ 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ |