[oe-commits] Martin Jansa : gcr: blacklist because of conflict with gnome-keyring
git at git.openembedded.org
git at git.openembedded.org
Tue Oct 7 02:48:08 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: 85b42840f68058455bce53a044a234e5c14be149
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=85b42840f68058455bce53a044a234e5c14be149
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Tue Oct 7 02:57:28 2014 +0200
gcr: blacklist because of conflict with gnome-keyring
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
index f30fcf1..1a70ac0 100644
--- a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
+++ b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
@@ -7,6 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt"
+PNBLACKLIST[gcr] = "CONFLICT: 4 files conflict with gnome-keyring"
+# e.g. sysroots/qemux86-64/usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
+# sysroots/qemux86-64/usr/share/GConf/gsettings/org.gnome.crypto.pgp.convert
+
inherit autotools gnomebase gtk-icon-cache gtk-doc
GNOME_COMPRESS_TYPE="xz"
More information about the Openembedded-commits
mailing list