summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-18 00:03:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-31 13:07:00 +0100
commit52295fa3deef3b0374b99829626d524cefae6001 (patch)
tree90a71c05f9efdb6d67685f27b33406ddcc4277df /meta/recipes-connectivity
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-connectivity')
-rw-r--r--meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb6
-rw-r--r--meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb6
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb b/meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb
index 4dfdcb247a..b6b3d7dcfd 100644
--- a/meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb
+++ b/meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb
@@ -3,11 +3,13 @@ LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 3LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
4SECTION = "console" 4SECTION = "console"
5PRIORITY = "optional" 5PRIORITY = "optional"
6PR = "r2" 6PR = "r3"
7 7
8SRC_URI = "file://02dtl1_cs.sh \ 8SRC_URI = "file://02dtl1_cs.sh \
9 file://COPYING.patch" 9 file://COPYING.patch"
10 10
11inherit allarch
12
11do_install() { 13do_install() {
12 install -d ${D}${sysconfdir}/apm/event.d/ 14 install -d ${D}${sysconfdir}/apm/event.d/
13 install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ 15 install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
@@ -15,5 +17,3 @@ do_install() {
15 17
16#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume 18#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
17FILES_${PN} += "${sysconfdir}/apm/" 19FILES_${PN} += "${sysconfdir}/apm/"
18
19PACKAGE_ARCH = "all"
diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
index 5cdba2ba11..d4ac77e921 100644
--- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
+++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
2DESCRIPTION = "Enables PPP dial-in through a serial connection" 2DESCRIPTION = "Enables PPP dial-in through a serial connection"
3DEPENDS = "ppp" 3DEPENDS = "ppp"
4RDEPENDS_${PN} = "ppp" 4RDEPENDS_${PN} = "ppp"
5PR = "r6" 5PR = "r7"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
10SRC_URI = "file://host-peer \ 10SRC_URI = "file://host-peer \
11 file://ppp-dialin" 11 file://ppp-dialin"
12 12
13inherit allarch
14
13do_install() { 15do_install() {
14 install -d ${D}${sysconfdir}/ppp/peers 16 install -d ${D}${sysconfdir}/ppp/peers
15 install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host 17 install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host
@@ -18,8 +20,6 @@ do_install() {
18 install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir} 20 install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir}
19} 21}
20 22
21PACKAGE_ARCH = "all"
22
23pkg_postinst_${PN} () { 23pkg_postinst_${PN} () {
24if test "x$D" != "x"; then 24if test "x$D" != "x"; then
25 exit 1 25 exit 1