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>
This commit is contained in:
parent
29a5cc693c
commit
47c5f1c3bc
|
@ -9,15 +9,16 @@ LICENSE = "GPLv2+"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
|
||||
AUTHOR = "Thomas Hood"
|
||||
HOMEPAGE = "http://packages.debian.org/resolvconf"
|
||||
DEPENDS = "bash"
|
||||
RDEPENDS_${PN} = "bash"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "59b20258bb8a3c25b8c4083fc0279547"
|
||||
SRC_URI[sha256sum] = "37691677cea24da66d6664c98668b5f16667c0133f17feb166f246ee923ad756"
|
||||
|
||||
inherit allarch
|
||||
|
||||
do_compile () {
|
||||
:
|
||||
}
|
||||
|
@ -31,6 +32,3 @@ do_install () {
|
|||
install -m 0644 README ${D}${docdir}/${P}/
|
||||
install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
|
||||
}
|
||||
|
||||
PACKAGE_ARCH = "all"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -8,11 +8,12 @@ BUGTRACKER = "https://bugzilla.redhat.com/"
|
|||
SECTION = "x11/fonts"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
||||
PACKAGE_ARCH = "all"
|
||||
RDEPENDS_${PN} = "fontconfig-utils"
|
||||
PR = "r1"
|
||||
PR = "r2"
|
||||
PE = "1"
|
||||
|
||||
inherit allarch
|
||||
|
||||
SRC_URI = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${PV}.tar.gz \
|
||||
file://30-liberation-aliases.conf"
|
||||
|
||||
|
|
|
@ -8,10 +8,9 @@ BUGTRACKER = "https://bugzilla.redhat.com/"
|
|||
SECTION = "x11/fonts"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||
PACKAGE_ARCH = "all"
|
||||
RDEPENDS_${PN} = "fontconfig-utils"
|
||||
PE = "1"
|
||||
PR = "r1"
|
||||
PR = "r2"
|
||||
|
||||
FONTREV = "0.20100721"
|
||||
SRC_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}.
|
|||
|
||||
S = ${WORKDIR}/${BPN}-${PV}.${FONTREV}
|
||||
|
||||
inherit allarch
|
||||
|
||||
do_install () {
|
||||
install -d ${D}${datadir}/fonts/ttf/
|
||||
for i in *.ttf; do
|
||||
|
|
|
@ -7,10 +7,11 @@ but is visibly different than normal and bold, and reasonably pleasing."
|
|||
SECTION = "x11/fonts"
|
||||
LICENSE = "Bitstream_Vera"
|
||||
LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be"
|
||||
PACKAGE_ARCH = "all"
|
||||
PR = "r4"
|
||||
PR = "r5"
|
||||
RDEPENDS_${PN} = "fontconfig-utils"
|
||||
|
||||
inherit allarch
|
||||
|
||||
SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2"
|
||||
|
||||
do_install () {
|
||||
|
|
|
@ -6,7 +6,7 @@ LICENSE = "GPLv2"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
||||
|
||||
SECTION = "x11/base"
|
||||
PR="r3"
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI = "http://matchbox-project.org/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
|
||||
file://use-relative-symlinks.patch \
|
||||
|
@ -16,6 +16,4 @@ SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23"
|
|||
SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4"
|
||||
FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
|
||||
|
||||
inherit autotools
|
||||
|
||||
PACKAGE_ARCH = "all"
|
||||
inherit autotools allarch
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
XORG_DEFAULT_OPTIONS pulls in the following dependency chains:
|
||||
|
||||
XORG_CWARNFLAGS -> AC_PROG_CC_C99
|
||||
XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS
|
||||
XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host
|
||||
|
||||
each of which triggers the use of the host compiler. As an "all"
|
||||
architecture package, it shouldn't need a compiler (and doesn't).
|
||||
|
||||
RP 17/5/2011
|
||||
|
||||
Index: encodings-1.0.4/configure.ac
|
||||
===================================================================
|
||||
--- encodings-1.0.4.orig/configure.ac 2011-05-17 23:36:19.505095876 +0100
|
||||
+++ encodings-1.0.4/configure.ac 2011-05-17 23:54:14.935096128 +0100
|
||||
@@ -4,12 +4,12 @@
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.3)
|
||||
-XORG_DEFAULT_OPTIONS
|
||||
-
|
||||
+XORG_RELEASE_VERSION
|
||||
+XORG_CHANGELOG
|
||||
+XORG_INSTALL
|
||||
AC_PROG_INSTALL
|
||||
|
||||
# Require X.Org's font util macros 1.2 or later
|
|
@ -7,13 +7,15 @@ require xorg-font-common.inc
|
|||
LICENSE = "PD"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76"
|
||||
PE = "1"
|
||||
PR = "${INC_PR}.0"
|
||||
PR = "${INC_PR}.1"
|
||||
|
||||
DEPENDS = "mkfontscale-native font-util-native"
|
||||
|
||||
EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings"
|
||||
SRC_URI += "file://nocompiler.patch"
|
||||
|
||||
PACKAGE_ARCH = "all"
|
||||
inherit allarch
|
||||
|
||||
EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings"
|
||||
|
||||
SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1"
|
||||
SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539"
|
||||
|
|
|
@ -13,10 +13,11 @@ LIC_FILES_CHKSUM = "file://../misc/fonts.alias;md5=bbe8d3c0e4e74af96e3ac393985c4
|
|||
SRC_URI = "file://misc"
|
||||
|
||||
PE = "1"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
inherit allarch
|
||||
|
||||
PACKAGES = "${PN}"
|
||||
PACKAGE_ARCH = "all"
|
||||
FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
|
||||
|
||||
do_install() {
|
||||
|
|
|
@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
|
|||
SECTION = "x11"
|
||||
DEPENDS = ""
|
||||
|
||||
inherit autotools pkgconfig
|
||||
inherit autotools pkgconfig allarch
|
||||
|
||||
FILES_${PN} += "${datadir}"
|
||||
|
||||
PACKAGE_ARCH = "all"
|
||||
|
||||
EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
|
||||
|
||||
#explictly setting "Sato" as default icon theme to avoid icon missing due to
|
||||
|
|
|
@ -2,6 +2,8 @@ require sato-icon-theme.inc
|
|||
|
||||
DEPENDS += "icon-naming-utils-native"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
|
||||
file://iconpath-option.patch"
|
||||
|
||||
|
|
Loading…
Reference in New Issue