diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-17 23:03:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:37:56 +0000 |
commit | 47c5f1c3bcf04b262396826e37c2ca3fbb492bb8 (patch) | |
tree | 59327539f1006f30fbdce83aebfe8d972698463e /meta/recipes-sato | |
parent | 29a5cc693cdc21f1f8724142c85e69a7f5c81a9d (diff) | |
download | poky-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-sato')
-rw-r--r-- | meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc | 4 | ||||
-rw-r--r-- | meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc index 0eff9dd7ae..75e029c0e8 100644 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc | |||
@@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2" | |||
8 | SECTION = "x11" | 8 | SECTION = "x11" |
9 | DEPENDS = "" | 9 | DEPENDS = "" |
10 | 10 | ||
11 | inherit autotools pkgconfig | 11 | inherit autotools pkgconfig allarch |
12 | 12 | ||
13 | FILES_${PN} += "${datadir}" | 13 | FILES_${PN} += "${datadir}" |
14 | 14 | ||
15 | PACKAGE_ARCH = "all" | ||
16 | |||
17 | EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" | 15 | EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" |
18 | 16 | ||
19 | #explictly setting "Sato" as default icon theme to avoid icon missing due to | 17 | #explictly setting "Sato" as default icon theme to avoid icon missing due to |
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb index e69481de3a..54e46277ff 100644 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb | |||
@@ -2,6 +2,8 @@ require sato-icon-theme.inc | |||
2 | 2 | ||
3 | DEPENDS += "icon-naming-utils-native" | 3 | DEPENDS += "icon-naming-utils-native" |
4 | 4 | ||
5 | PR = "r1" | ||
6 | |||
5 | SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ | 7 | SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ |
6 | file://iconpath-option.patch" | 8 | file://iconpath-option.patch" |
7 | 9 | ||