summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
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-05-31 12:07:00 (GMT)
commit52295fa3deef3b0374b99829626d524cefae6001 (patch)
tree90a71c05f9efdb6d67685f27b33406ddcc4277df /meta/recipes-bsp
parentc3a7382c9aa56fdc06198788833a27e882d5030a (diff)
downloadpoky-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-bsp')
-rw-r--r--meta/recipes-bsp/hostap/hostap-conf_1.0.bb5
-rw-r--r--meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb5
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config.bb5
3 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index de72b76..c602e8c 100644
--- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
+++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
@@ -4,12 +4,13 @@ PRIORITY = "optional"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
6RDEPENDS_${PN} = "update-modules" 6RDEPENDS_${PN} = "update-modules"
7PACKAGE_ARCH = "all" 7PR = "r14"
8PR = "r12"
9 8
10SRC_URI = "file://hostap_cs.modalias \ 9SRC_URI = "file://hostap_cs.modalias \
11 file://COPYING.patch" 10 file://COPYING.patch"
12 11
12inherit allarch
13
13do_compile() { 14do_compile() {
14} 15}
15 16
diff --git a/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
index 1c25e02..98d3aed 100644
--- a/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
+++ b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
@@ -4,12 +4,13 @@ PRIORITY = "optional"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
6RDEPENDS_${PN} = "update-modules" 6RDEPENDS_${PN} = "update-modules"
7PACKAGE_ARCH = "all" 7PR = "r7"
8PR = "r6"
9 8
10SRC_URI = "file://orinoco_cs.conf \ 9SRC_URI = "file://orinoco_cs.conf \
11 file://COPYING.patch" 10 file://COPYING.patch"
12 11
12inherit allarch
13
13do_install() { 14do_install() {
14 install -d ${D}${sysconfdir}/modutils 15 install -d ${D}${sysconfdir}/modutils
15 install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/ 16 install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index f91875e..70a113e 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
5 5
6COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)" 6COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
7 7
8PR = "r20" 8PR = "r21"
9 9
10SRC_URI = "file://distcc.sh \ 10SRC_URI = "file://distcc.sh \
11 file://anjuta-remote-run \ 11 file://anjuta-remote-run \
@@ -33,9 +33,8 @@ do_install() {
33} 33}
34 34
35RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash" 35RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash"
36PACKAGE_ARCH = "all"
37 36
38inherit update-rc.d 37inherit update-rc.d allarch
39 38
40INITSCRIPT_NAME = "qemu-autostart" 39INITSCRIPT_NAME = "qemu-autostart"
41INITSCRIPT_PARAMS = "start 999 5 2 . stop 20 0 1 6 ." 40INITSCRIPT_PARAMS = "start 999 5 2 . stop 20 0 1 6 ."