diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-17 23:03:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-04 13:46:26 +0100 |
commit | 9bf0d8898b028f2b3379dc43fe647eb38c022f53 (patch) | |
tree | 2b2d3ab2f12a8366e75b0e2fcba081226df03b58 /meta/recipes-gnome/gnome | |
parent | bcc8425b92dc9adc793473a9733559d377480811 (diff) | |
download | poky-9bf0d8898b028f2b3379dc43fe647eb38c022f53.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)
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/gnome')
-rw-r--r-- | meta/recipes-gnome/gnome/gnome-common_2.28.0.bb | 7 | ||||
-rw-r--r-- | meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 3 |
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" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
7 | 7 | ||
8 | SECTION = "x11/gnome" | 8 | SECTION = "x11/gnome" |
9 | PR = "r0" | 9 | PR = "r1" |
10 | inherit gnome | 10 | inherit 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 | |||
22 | EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" | 22 | EXTRA_OECONF = "--disable-hicolor-check --with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" |
23 | 23 | ||
24 | inherit autotools | 24 | inherit autotools |
25 | |||
26 | # We can't do this until the output is shared into all target sysroots | ||
27 | #PACKAGE_ARCH = "all" | ||