summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 23:03:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 11:34:22 +0100
commit85d8362e0c443f11fe8d3fd0fba55d1bd4983613 (patch)
tree486f176b9c9be22974186fcecc0ad568f3669950 /meta/recipes-gnome
parent68189d7c372a861767b5db90376d61e165f9771b (diff)
downloadopenembedded-core-contrib-85d8362e0c443f11fe8d3fd0fba55d1bd4983613.tar.gz
Improve handling of 'all' architecture recipes and their interaction with sstate
* Jansa: rebased on current master, added nocompiler patch also to font-alias, dropped allarch from linux-firmware, gnome-icon-theme, hal-info as those are checking compiler (ie in intltool check) and better to build them as default arch instead of rebuilding after every machine change. * this is also part of [BUGID# 1075] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gnome/gnome-common_2.28.0.bb7
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb3
2 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
index 570c45a703..8936dbd8b9 100644
--- a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
@@ -6,11 +6,8 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SECTION = "x11/gnome"
-PR = "r0"
-inherit gnome
-
-# all isn't appropriate since STAGING_DATADIR is target specific
-# PACKAGE_ARCH="all"
+PR = "r1"
+inherit gnome allarch
# The omf.make file failed if scrollkeeper doesn't happen to be
# installed
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
index 55868abf7f..587ac40a1e 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
@@ -22,6 +22,3 @@ SRC_URI[sha256sum] = "ea7e05b77ead159379392b3b275ca0c9cbacd7d936014e447cc7c5e27a
EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
inherit autotools
-
-# We can't do this until the output is shared into all target sysroots
-#PACKAGE_ARCH = "all"