diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-06 08:01:57 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-17 12:55:40 +0100 |
| commit | 96a92761c0a1bb2317fa4ea422c32e4473405103 (patch) | |
| tree | e2fab4282e2049a333927f5a604676ea3ca0553a /meta-gnome | |
| parent | 1e9d3afe66d9e99904f9ce2730c33bdf47060499 (diff) | |
| download | meta-openembedded-contrib-96a92761c0a1bb2317fa4ea422c32e4473405103.tar.gz | |
PNBLACKLIST: use weak assignments
* this makes it easier to unblacklist it from local.conf which
is parsed before the recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
6 files changed, 6 insertions, 6 deletions
diff --git a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb index c5ac6e23fb..ef460f13df 100644 --- a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb +++ b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb @@ -5,7 +5,7 @@ SECTION = "multimedia" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -PNBLACKLIST[gnome-mplayer] = "rdepends on blacklisted mplayer" +PNBLACKLIST[gnome-mplayer] ?= "rdepends on blacklisted mplayer" PR = "r2" DEPENDS = "gmtk gtk+ alsa-lib libnotify glib-2.0 dbus-glib virtual/libx11 libxscrnsaver" 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 1a70ac0cf2..e9a837bb95 100644 --- a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb +++ b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb @@ -7,7 +7,7 @@ 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" +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 diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb index 38ea5e51a3..611499affc 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" -PNBLACKLIST[gnome-menus3] = "CONFLICT: 24 files are conflicting with gnome-menus" +PNBLACKLIST[gnome-menus3] ?= "CONFLICT: 24 files are conflicting with gnome-menus" # e.g. sysroots/qemux86-64/usr/share/desktop-directories/X-GNOME-Other.directory DEPENDS = "python libxml2 gconf popt gtk+3" 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 f89f3da9c9..972a4d4db0 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,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1" BPN = "gnome-panel" PR = "r1" -PNBLACKLIST[gnome-panel3] = "CONFLICT: depends on libgweather3 which conflicts with libgweather" +PNBLACKLIST[gnome-panel3] ?= "CONFLICT: depends on libgweather3 which conflicts with libgweather" # conflicts with gnome-panel, because they provide the same package # http://patches.openembedded.org/patch/43105/ diff --git a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb index 69cdd8f512..6e1997f775 100644 --- a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb +++ b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "x11/gnome/libs" DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3" -PNBLACKLIST[libgweather3] = "CONFLICT: 876 files are conflicting with libgweather" +PNBLACKLIST[libgweather3] ?= "CONFLICT: 876 files are conflicting with libgweather" # e.g. sysroots/qemux86-64/usr/share/libgweather/locations.dtd # sysroots/qemux86-64/usr/share/libgweather/Locations.zh_TW.xml diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb index 3ea179e7c7..4e01c5c938 100644 --- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb +++ b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" PR = "r2" -PNBLACKLIST[zenity] = "BROKEN: doesn't build with B!=S" +PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S" DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils" |