diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-18 00:03:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-31 13:07:00 +0100 |
commit | 52295fa3deef3b0374b99829626d524cefae6001 (patch) | |
tree | 90a71c05f9efdb6d67685f27b33406ddcc4277df /meta/recipes-graphics/x11-common | |
parent | c3a7382c9aa56fdc06198788833a27e882d5030a (diff) | |
download | poky-52295fa3deef3b0374b99829626d524cefae6001.tar.gz |
Improve handling of 'all' architecture recipes and their interaction with sstate
The existing PACKAGE_ARCH = "all" mechanism of sharing packages is problematic
with sstate since there are a variety of variables which have target specific
values and the sstate package therefore correctly changes signature depending
on the MACHINE setting.
This patch creates a new "allarch" class which sets:
PACKAGE_ARCH = "all"
(as per the existing convention)
INHIBIT_DEFAULT_DEPS = "1"
(since its not target specific and therefore can't depend on the cross
compiler or target libc)
TARGET_ARCH = "all"
TARGET_OS = "linux"
TARGET_CC_ARCH = "none"
(since these variables shouldn't change between the different packages and
target compiler flags shouldn't be getting used)
PACKAGE_EXTRA_ARCHS = ""
(since we shouldn't be depending on any architecture specific package architectures)
Not all PACKAGE_ARCH = "all" recipes can use this class since some run configure
checks on the compiler. This means they have target specific components and therefore
the "all" classification is incorrect.
(From OE-Core rev: 26e5e5feb695864b11e47e24017e254c28f14494)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/x11-common')
-rw-r--r-- | meta/recipes-graphics/x11-common/x11-common_0.1.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb index 6951cf3771..b6bd61a74c 100644 --- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb +++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb | |||
@@ -2,13 +2,15 @@ DESCRIPTION = "Common X11 scripts and configuration files" | |||
2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPLv2" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
4 | SECTION = "x11" | 4 | SECTION = "x11" |
5 | PR = "r43" | 5 | PR = "r44" |
6 | 6 | ||
7 | SRC_URI = "file://etc \ | 7 | SRC_URI = "file://etc \ |
8 | file://gplv2-license.patch" | 8 | file://gplv2-license.patch" |
9 | 9 | ||
10 | S = ${WORKDIR} | 10 | S = ${WORKDIR} |
11 | 11 | ||
12 | inherit allarch | ||
13 | |||
12 | do_install() { | 14 | do_install() { |
13 | cp -R ${S}/etc ${D}/etc | 15 | cp -R ${S}/etc ${D}/etc |
14 | chmod -R 755 ${D}/etc | 16 | chmod -R 755 ${D}/etc |
@@ -17,5 +19,4 @@ do_install() { | |||
17 | } | 19 | } |
18 | 20 | ||
19 | RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor" | 21 | RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor" |
20 | PACKAGE_ARCH = "all" | ||
21 | 22 | ||