[PATCH] wpa-supplicant-0.7.3: use MACHINE_ARCH

[PATCH] wpa-supplicant-0.7.3: use MACHINE_ARCH

[Andreas Oberritter]

* 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@opendreambox.org>
CC: Stefan Schmidt <stefan@datenfreihafen.org>
---
 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"
-- 
1.7.2.3

Re: [PATCH] wpa-supplicant-0.7.3: use MACHINE_ARCH

[Stefan Schmidt]

Hello.

On Wed, 2011-02-16 at 03:03, Andreas Oberritter wrote:
> * 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@opendreambox.org>
> CC: Stefan Schmidt <stefan@datenfreihafen.org>

Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>

regards
Stefan Schmidt

Re: [PATCH] wpa-supplicant-0.7.3: use MACHINE_ARCH

[Marcin Juszkiewicz]

Dnia środa, 16 lutego 2011 o 04:03:24 Andreas Oberritter napisał(a):
> * Because of madwifi, wpa-supplicant depends on COMBINED_FEATURES.
>   Thus, PACKAGE_ARCH must be set to MACHINE_ARCH.
> * Use INC_PR and bump it.

What about setting PACKAGE_ARCH=MACHINE_ARCH only for machines with madwifi? 
Most of out targets does not support madwifi.

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

Re: [PATCH] wpa-supplicant-0.7.3: use MACHINE_ARCH

[Otavio Salvador]

On Wed, Feb 16, 2011 at 09:30, Marcin Juszkiewicz
<marcin@juszkiewicz.com.pl> wrote:
> Dnia środa, 16 lutego 2011 o 04:03:24 Andreas Oberritter napisał(a):
>> * Because of madwifi, wpa-supplicant depends on COMBINED_FEATURES.
>>   Thus, PACKAGE_ARCH must be set to MACHINE_ARCH.
>> * Use INC_PR and bump it.
>
> What about setting PACKAGE_ARCH=MACHINE_ARCH only for machines with madwifi?
> Most of out targets does not support madwifi.

Well but not having it is also an "option" so it seems the right is to
have it globaly.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [PATCH] wpa-supplicant-0.7.3: use MACHINE_ARCH

[Andreas Oberritter]

On 02/16/2011 10:30 AM, Marcin Juszkiewicz wrote:
> Dnia środa, 16 lutego 2011 o 04:03:24 Andreas Oberritter napisał(a):
>> * Because of madwifi, wpa-supplicant depends on COMBINED_FEATURES.
>>   Thus, PACKAGE_ARCH must be set to MACHINE_ARCH.
>> * Use INC_PR and bump it.
> 
> What about setting PACKAGE_ARCH=MACHINE_ARCH only for machines with madwifi? 
> Most of out targets does not support madwifi.

Does opkg always prefer machine packages over arch packages, if you have
shared deploy directories for multiple machines? Would other package
managers like dpkg be able to handle that correctly, too? Hm, I'm not
sure whether dpkg supports multi-machine builds at all.

Regards,
Andreas