diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 11:53:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-01 07:43:32 +0100 |
| commit | 5bfcd13c074a69cfb1cf9108cbccee472bad4409 (patch) | |
| tree | dd7184e90b27bd4f5c36e390a1bcddaf3252e2cf /meta/recipes-kernel | |
| parent | 5b629a962d05aa1ae9d017058d078476d3675850 (diff) | |
| download | poky-5bfcd13c074a69cfb1cf9108cbccee472bad4409.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.
(From OE-Core rev: ef967c70182eeccb59c7511d838a7ecb0b2315c1)
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 | |||
| 2 | 2 | ||
| 3 | DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf" | 3 | DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf" |
| 4 | 4 | ||
| 5 | inherit distro_features_check | ||
| 6 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | ||
| 7 | |||
| 5 | SRCREV = "389e1875af4721d52c7e65cf9cfffb69b0ed6a59" | 8 | SRCREV = "389e1875af4721d52c7e65cf9cfffb69b0ed6a59" |
| 6 | PV = "0.0+git${SRCPV}" | 9 | PV = "0.0+git${SRCPV}" |
| 7 | 10 | ||
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" | |||
| 19 | 19 | ||
| 20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
| 21 | 21 | ||
| 22 | inherit autotools pkgconfig | 22 | inherit autotools pkgconfig distro_features_check |
| 23 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | ||
| 23 | 24 | ||
| 24 | # We do not yet work for aarch64. | 25 | # We do not yet work for aarch64. |
| 25 | # | 26 | # |
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 \ | |||
| 9 | DEPENDS = "gtk+ libxml2" | 9 | DEPENDS = "gtk+ libxml2" |
| 10 | RDEPENDS_${PN} = "trace-cmd" | 10 | RDEPENDS_${PN} = "trace-cmd" |
| 11 | 11 | ||
| 12 | inherit distro_features_check | ||
| 13 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | ||
| 14 | |||
| 12 | EXTRA_OEMAKE = "\ | 15 | EXTRA_OEMAKE = "\ |
| 13 | 'prefix=${prefix}' \ | 16 | 'prefix=${prefix}' \ |
| 14 | 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ | 17 | 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ |
