summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 23:03:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 12:46:26 (GMT)
commit9bf0d8898b028f2b3379dc43fe647eb38c022f53 (patch)
tree2b2d3ab2f12a8366e75b0e2fcba081226df03b58 /meta
parentbcc8425b92dc9adc793473a9733559d377480811 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf_1.59.bb8
-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
-rw-r--r--meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb5
-rw-r--r--meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb5
-rw-r--r--meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb5
-rw-r--r--meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb6
-rw-r--r--meta/recipes-graphics/xorg-font/encodings/nocompiler.patch31
-rw-r--r--meta/recipes-graphics/xorg-font/encodings_1.0.4.bb8
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb5
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc4
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb2
12 files changed, 58 insertions, 31 deletions
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.59.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.59.bb
index 94231e0..8e0b215 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.59.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.59.bb
@@ -9,15 +9,16 @@ LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" 9LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
10AUTHOR = "Thomas Hood" 10AUTHOR = "Thomas Hood"
11HOMEPAGE = "http://packages.debian.org/resolvconf" 11HOMEPAGE = "http://packages.debian.org/resolvconf"
12DEPENDS = "bash"
13RDEPENDS_${PN} = "bash" 12RDEPENDS_${PN} = "bash"
14PR = "r0" 13PR = "r1"
15 14
16SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" 15SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
17 16
18SRC_URI[md5sum] = "59b20258bb8a3c25b8c4083fc0279547" 17SRC_URI[md5sum] = "59b20258bb8a3c25b8c4083fc0279547"
19SRC_URI[sha256sum] = "37691677cea24da66d6664c98668b5f16667c0133f17feb166f246ee923ad756" 18SRC_URI[sha256sum] = "37691677cea24da66d6664c98668b5f16667c0133f17feb166f246ee923ad756"
20 19
20inherit allarch
21
21do_compile () { 22do_compile () {
22 : 23 :
23} 24}
@@ -31,6 +32,3 @@ do_install () {
31 install -m 0644 README ${D}${docdir}/${P}/ 32 install -m 0644 README ${D}${docdir}/${P}/
32 install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ 33 install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
33} 34}
34
35PACKAGE_ARCH = "all"
36
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 570c45a..8936dbd 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 55868ab..587ac40 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"
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
index 19bb69c..b0a8242 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
@@ -8,11 +8,12 @@ BUGTRACKER = "https://bugzilla.redhat.com/"
8SECTION = "x11/fonts" 8SECTION = "x11/fonts"
9LICENSE = "GPLv2" 9LICENSE = "GPLv2"
10LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 10LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
11PACKAGE_ARCH = "all"
12RDEPENDS_${PN} = "fontconfig-utils" 11RDEPENDS_${PN} = "fontconfig-utils"
13PR = "r1" 12PR = "r2"
14PE = "1" 13PE = "1"
15 14
15inherit allarch
16
16SRC_URI = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${PV}.tar.gz \ 17SRC_URI = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${PV}.tar.gz \
17 file://30-liberation-aliases.conf" 18 file://30-liberation-aliases.conf"
18 19
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
index 4882cc7..5193fda 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
@@ -8,10 +8,9 @@ BUGTRACKER = "https://bugzilla.redhat.com/"
8SECTION = "x11/fonts" 8SECTION = "x11/fonts"
9LICENSE = "GPLv2" 9LICENSE = "GPLv2"
10LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 10LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
11PACKAGE_ARCH = "all"
12RDEPENDS_${PN} = "fontconfig-utils" 11RDEPENDS_${PN} = "fontconfig-utils"
13PE = "1" 12PE = "1"
14PR = "r1" 13PR = "r2"
15 14
16FONTREV = "0.20100721" 15FONTREV = "0.20100721"
17SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.tar.gz \ 16SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.tar.gz \
@@ -19,6 +18,8 @@ SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.
19 18
20S = ${WORKDIR}/${BPN}-${PV}.${FONTREV} 19S = ${WORKDIR}/${BPN}-${PV}.${FONTREV}
21 20
21inherit allarch
22
22do_install () { 23do_install () {
23 install -d ${D}${datadir}/fonts/ttf/ 24 install -d ${D}${datadir}/fonts/ttf/
24 for i in *.ttf; do 25 for i in *.ttf; do
diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
index 3294b40..682184a 100644
--- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
+++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
@@ -7,10 +7,11 @@ but is visibly different than normal and bold, and reasonably pleasing."
7SECTION = "x11/fonts" 7SECTION = "x11/fonts"
8LICENSE = "Bitstream_Vera" 8LICENSE = "Bitstream_Vera"
9LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" 9LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be"
10PACKAGE_ARCH = "all" 10PR = "r5"
11PR = "r4"
12RDEPENDS_${PN} = "fontconfig-utils" 11RDEPENDS_${PN} = "fontconfig-utils"
13 12
13inherit allarch
14
14SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" 15SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2"
15 16
16do_install () { 17do_install () {
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index 002cc15..824c295 100644
--- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7 7
8SECTION = "x11/base" 8SECTION = "x11/base"
9PR="r3" 9PR = "r4"
10 10
11SRC_URI = "http://matchbox-project.org/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \ 11SRC_URI = "http://matchbox-project.org/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
12 file://use-relative-symlinks.patch \ 12 file://use-relative-symlinks.patch \
@@ -16,6 +16,4 @@ SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23"
16SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4" 16SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4"
17FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" 17FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
18 18
19inherit autotools 19inherit autotools allarch
20
21PACKAGE_ARCH = "all"
diff --git a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch
new file mode 100644
index 0000000..1cddd10
--- /dev/null
+++ b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch
@@ -0,0 +1,31 @@
1XORG_DEFAULT_OPTIONS pulls in the following dependency chains:
2
3XORG_CWARNFLAGS -> AC_PROG_CC_C99
4XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS
5XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host
6
7each of which triggers the use of the host compiler. As an "all"
8architecture package, it shouldn't need a compiler (and doesn't).
9
10RP 17/5/2011
11
12Index: encodings-1.0.4/configure.ac
13===================================================================
14--- encodings-1.0.4.orig/configure.ac 2011-05-17 23:36:19.505095876 +0100
15+++ encodings-1.0.4/configure.ac 2011-05-17 23:54:14.935096128 +0100
16@@ -4,12 +4,12 @@
17 AM_INIT_AUTOMAKE([foreign dist-bzip2])
18 AM_MAINTAINER_MODE
19
20-# Require xorg-macros: XORG_DEFAULT_OPTIONS
21 m4_ifndef([XORG_MACROS_VERSION],
22 [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
23 XORG_MACROS_VERSION(1.3)
24-XORG_DEFAULT_OPTIONS
25-
26+XORG_RELEASE_VERSION
27+XORG_CHANGELOG
28+XORG_INSTALL
29 AC_PROG_INSTALL
30
31 # Require X.Org's font util macros 1.2 or later
diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb
index 1345134..cf7b3e3 100644
--- a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb
@@ -7,13 +7,15 @@ require xorg-font-common.inc
7LICENSE = "PD" 7LICENSE = "PD"
8LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" 8LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76"
9PE = "1" 9PE = "1"
10PR = "${INC_PR}.0" 10PR = "${INC_PR}.1"
11 11
12DEPENDS = "mkfontscale-native font-util-native" 12DEPENDS = "mkfontscale-native font-util-native"
13 13
14EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" 14SRC_URI += "file://nocompiler.patch"
15
16inherit allarch
15 17
16PACKAGE_ARCH = "all" 18EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings"
17 19
18SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" 20SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1"
19SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" 21SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539"
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index f1e8648..b1a65e7 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
@@ -13,10 +13,11 @@ LIC_FILES_CHKSUM = "file://../misc/fonts.alias;md5=bbe8d3c0e4e74af96e3ac393985c4
13SRC_URI = "file://misc" 13SRC_URI = "file://misc"
14 14
15PE = "1" 15PE = "1"
16PR = "r0" 16PR = "r1"
17
18inherit allarch
17 19
18PACKAGES = "${PN}" 20PACKAGES = "${PN}"
19PACKAGE_ARCH = "all"
20FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" 21FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
21 22
22do_install() { 23do_install() {
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 0eff9dd..75e029c 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"
8SECTION = "x11" 8SECTION = "x11"
9DEPENDS = "" 9DEPENDS = ""
10 10
11inherit autotools pkgconfig 11inherit autotools pkgconfig allarch
12 12
13FILES_${PN} += "${datadir}" 13FILES_${PN} += "${datadir}"
14 14
15PACKAGE_ARCH = "all"
16
17EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping" 15EXTRA_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 e69481d..54e4627 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
3DEPENDS += "icon-naming-utils-native" 3DEPENDS += "icon-naming-utils-native"
4 4
5PR = "r1"
6
5SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ 7SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
6 file://iconpath-option.patch" 8 file://iconpath-option.patch"
7 9