summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2011-08-12 16:57:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 15:13:34 +0100
commit2f94ff4fdb66755ba2448794baea19315ff96273 (patch)
tree49a900d96cc81634343264e5c2b37c072f53240e
parente3432253da5af35345a978c7435e31fee6938217 (diff)
downloadopenembedded-core-2f94ff4fdb66755ba2448794baea19315ff96273.tar.gz
openembedded-core-2f94ff4fdb66755ba2448794baea19315ff96273.tar.bz2
openembedded-core-2f94ff4fdb66755ba2448794baea19315ff96273.tar.xz
openembedded-core-2f94ff4fdb66755ba2448794baea19315ff96273.zip
libx11: skip self if x11 not in DISTRO_FEATURES
This stops (most) x11 packages leaking into a non-x11 distro by mistake. Signed-off-by: Phil Blundell <philb@gnu.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index c156ce6dc..455753f5d 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -42,3 +42,8 @@ do_compile() {
# Multiple libx11 derivatives from from this file and are selected by virtual/libx11
# A world build should only build the correct version, not all of them.
EXCLUDE_FROM_WORLD = "1"
+
+python () {
+ if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d):
+ raise bb.parse.SkipPackage("X11 not enabled for this DISTRO")
+}