aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-01-28 13:17:21 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2013-01-31 12:58:31 +0100
commit048b1ea461c2d116b7e31161bae0dee1f9e06a7e (patch)
treec15cdca1e3d85b3e6e1d0a52b92fe81ca181c72a
parent6139a58374dfb73caabc40877b62064bc0cf383d (diff)
downloadmeta-openembedded-contrib-048b1ea461c2d116b7e31161bae0dee1f9e06a7e.tar.gz
gnome-panel3: exclude from world
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
index bd21ca11bd..3aadd2b24d 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
@@ -4,6 +4,9 @@ LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1"
BPN = "gnome-panel"
PR = "r1"
+# conflicts with gnome-panel, because they provide the same package
+# http://patches.openembedded.org/patch/43105/
+EXCLUDE_FROM_WORLD = "1"
DEFAULT_PREFERENCE = "-1"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \