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>2012-01-30 16:37:56 +0000
commit47c5f1c3bcf04b262396826e37c2ca3fbb492bb8 (patch)
tree59327539f1006f30fbdce83aebfe8d972698463e /meta/recipes-gnome
parent29a5cc693cdc21f1f8724142c85e69a7f5c81a9d (diff)
downloadpoky-47c5f1c3bcf04b262396826e37c2ca3fbb492bb8.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] (From OE-Core rev: 85d8362e0c443f11fe8d3fd0fba55d1bd4983613) (From OE-Core rev: bfb58bf95f1796deebc9759da6d22949d62e7070) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 7
8SECTION = "x11/gnome" 8SECTION = "x11/gnome"
9PR = "r0" 9PR = "r1"
10inherit gnome 10inherit gnome allarch
11
12# all isn't appropriate since STAGING_DATADIR is target specific
13# PACKAGE_ARCH="all"
14 11
15# The omf.make file failed if scrollkeeper doesn't happen to be 12# The omf.make file failed if scrollkeeper doesn't happen to be
16# installed 13# 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
22EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" 22EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
23 23
24inherit autotools 24inherit autotools
25
26# We can't do this until the output is shared into all target sysroots
27#PACKAGE_ARCH = "all"