[oe-commits] Andreas Oberritter : wpa-supplicant-0.7.3: use MACHINE_ARCH

[git version control]

Module: openembedded.git
Branch: trini/simplify-target-flags
Commit: 5ee35b8afcac8ee45c50e0b75eb40c7882cf7917
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5ee35b8afcac8ee45c50e0b75eb40c7882cf7917

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Wed Feb 16 11:03:24 2011 +0000

wpa-supplicant-0.7.3: use MACHINE_ARCH

* Because of madwifi, wpa-supplicant depends on COMBINED_FEATURES.
  Thus, PACKAGE_ARCH must be set to MACHINE_ARCH.
* Use INC_PR and bump it.

Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
CC: Stefan Schmidt <stefan at datenfreihafen.org>
Acked-by: Stefan Schmidt <stefan at datenfreihafen.org>
Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 recipes/wpa-supplicant/wpa-supplicant-0.7.inc  |    3 +++
 recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
index e01d1ef..b4e996a 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
                     file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e"
 DEPENDS = "gnutls dbus libnl2 openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
 RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
+INC_PR = "r5"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
            file://defconfig \
@@ -80,6 +81,8 @@ do_install () {
 	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
 }
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 pkg_postinst_wpa-supplicant () {
 	# can't do this offline
 	if [ "x$D" != "x" ]; then
diff --git a/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb b/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb
index 03bd937..60a4791 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@
 require wpa-supplicant-0.7.inc
 
-PR = "r4"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
 SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"