diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-01-08 00:51:43 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-08 00:51:43 +0000 |
| commit | 6934ec6391878e8fc231dccbd00922a804706c0b (patch) | |
| tree | 7d4eda8d916842a750e0c77e89e9e7f918a4b265 | |
| parent | f2f9caadc01843d18f567cb85d072d1002b7fcb5 (diff) | |
| parent | 9dd0bd811c1e340d8854b19e8f398244e7cc0523 (diff) | |
merge of b1dcd027693e6239eac9bebf42988acd618f1125
and f7eb46be5e3e57b355a45440ee6c36224be527df
| -rw-r--r-- | classes/image_ipk.bbclass | 1 | ||||
| -rw-r--r-- | classes/native.bbclass | 1 | ||||
| -rw-r--r-- | packages/opie-pics/opie-pics.inc | 2 | ||||
| -rw-r--r-- | packages/orinoco/spectrum-fw.bb | 1 | ||||
| -rw-r--r-- | packages/prism3-support/prism3-support_1.0.0.bb | 1 | ||||
| -rw-r--r-- | packages/tslib/tslib-maemo_0.0.1-15.bb | 2 | ||||
| -rw-r--r-- | packages/tslib/tslib_cvs.bb | 4 |
7 files changed, 8 insertions, 4 deletions
diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index f6af799e69..c2f1c8d682 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -9,6 +9,7 @@ EXCLUDE_FROM_WORLD = "1" USE_DEVFS ?= "0" DEPENDS += "makedevs-native" +PACKAGE_ARCH = "${MACHINE_ARCH}" def get_image_deps(d): import bb diff --git a/classes/native.bbclass b/classes/native.bbclass index 955a8ae646..f0a77d6e11 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -5,6 +5,7 @@ inherit base EXCLUDE_FROM_WORLD = "1" PACKAGES = "" +PACKAGE_ARCH = "native" TARGET_ARCH = "${BUILD_ARCH}" TARGET_OS = "${BUILD_OS}" diff --git a/packages/opie-pics/opie-pics.inc b/packages/opie-pics/opie-pics.inc index ceca75f943..fb0898297e 100644 --- a/packages/opie-pics/opie-pics.inc +++ b/packages/opie-pics/opie-pics.inc @@ -28,5 +28,5 @@ do_install() { } FILES_${PN} = "${palmtopdir}" -PACKAGE_ARCH = "${MACHINE}" +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/orinoco/spectrum-fw.bb b/packages/orinoco/spectrum-fw.bb index 1d388332a5..dd76000ed1 100644 --- a/packages/orinoco/spectrum-fw.bb +++ b/packages/orinoco/spectrum-fw.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Firmware for Spectrum Wireless LAN cards" LICENSE = "unknown" PR = "r0" +PACKAGE_ARCH = "all" SRC_URI = "file://get_symbol_fw \ file://parse_symbol_fw" diff --git a/packages/prism3-support/prism3-support_1.0.0.bb b/packages/prism3-support/prism3-support_1.0.0.bb index 762bd01e61..12a8caea81 100644 --- a/packages/prism3-support/prism3-support_1.0.0.bb +++ b/packages/prism3-support/prism3-support_1.0.0.bb @@ -5,6 +5,7 @@ DEPENDS = "prism3-firmware hostap-utils" RDEPENDS = "prism3-firmware hostap-utils" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PR = "r0" +PACKAGE_ARCH = "all" SRC_URI = "file://hostap-fw-load" diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb index 6bc844e8dd..1c91485ed0 100644 --- a/packages/tslib/tslib-maemo_0.0.1-15.bb +++ b/packages/tslib/tslib-maemo_0.0.1-15.bb @@ -5,7 +5,7 @@ PR = "r1" PROVIDES = "tslib" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -PACKAGE_ARCH_tslib-conf = "${MACHINE}" +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \ file://ts.conf \ diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index ecf1722e94..cd2d65f515 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -4,8 +4,8 @@ PV = "0.0+cvs${SRCDATE}" PR = "r32" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -PACKAGE_ARCH_tslib-conf = "${MACHINE}" -PACKAGE_ARCH_mnci = "${MACHINE}" +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ file://ts.conf \ |