Patchwork [4/5] gnome-panel3: exclude from world

login
register
mail settings
Submitter Martin Jansa
Date Jan. 29, 2013, 12:29 p.m.
Message ID <960c2d6177413206ee78b8d9d092fa93c5ea62a3.1359462547.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/43631/
State Accepted, archived
Commit 048b1ea461c2d116b7e31161bae0dee1f9e06a7e
Headers show

Comments

Martin Jansa - Jan. 29, 2013, 12:29 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb | 3 +++
 1 file changed, 3 insertions(+)

Patch

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 bd21ca1..3aadd2b 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 \