From 9bf0d8898b028f2b3379dc43fe647eb38c022f53 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 17 May 2011 23:03:02 +0000 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-gnome/gnome/gnome-common_2.28.0.bb | 7 ++----- meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'meta/recipes-gnome/gnome') 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" -- cgit v1.2.3-54-g00ecf