[Madwifi-devel] [PATCH]: add ARCH=x86 workaround in scripts/get_arch.mk

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <madwifi-devel@...>
Date: Thursday, January 31, 2008 - 8:34 am

Debian's linux-image-2.6.24 and above will report "x86" as ARCH for i386
and amd64 in linux-2.6.24 packages.

This break madwifi build:

/usr/bin/make -C /usr/src/modules/madwifi modules \
        KERNELPATH=/lib/modules/2.6.24-1-686/build KERNELRELEASE=2.6.24-1-686 KERNELCONF=/lib/modules/2.6.24-1-686/build/.config
make[2]: Entering directory `/usr/src/modules/madwifi'
Checking requirements... ok.
Checking kernel configuration... ok.
/usr/bin/make -C /lib/modules/2.6.24-1-686/build SUBDIRS=/usr/src/modules/madwifi modules
make[3]: Entering directory `/usr/src/linux-headers-2.6.24-1-686'
/usr/src/modules/madwifi/scripts/get_arch.mk:44: *** ARCH mismatch: supplied "x86", determined "i386".  Stop.
make[3]: *** [_module_/usr/src/modules/madwifi] Error 2
make[3]: Leaving directory `/usr/src/linux-headers-2.6.24-1-686'
make[2]: *** [modules] Error 2
make[2]: Leaving directory `/usr/src/modules/madwifi'
make[1]: *** [binary-modules] Error 2
make[1]: Leaving directory `/usr/src/modules/madwifi'
make: *** [kdist_build] Error 2

For more infomation, see http://bugs.debian.org/463353

Do you think there is better way to address this problem than what is attached
below?

Thanks, Kel.
---
--- a/scripts/get_arch.mk
+++ b/scripts/get_arch.mk
@@ -40,6 +40,14 @@
 ifeq (,$(ARCH))
 ARCH = $(ARCH-y)
 else
+ifeq ($(filter-out x86,$(ARCH)),)
+ifeq (x86_64,$(ARCH-y))
+ARCH = $(ARCH-y)
+endif
+ifeq (i386,$(ARCH-y))
+ARCH = $(ARCH-y)
+endif
+endif
 ifneq ($(ARCH),$(ARCH-y))
 $(error ARCH mismatch: supplied "$(ARCH)", determined "$(ARCH-y)")
 endif
---

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Madwifi-devel mailing list
Madwifi-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/madwifi-devel
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[Madwifi-devel] [PATCH]: add ARCH=x86 workaround in scripts/..., Kel Modderman, (Thu Jan 31, 8:34 am)
Re: [Madwifi-devel] [PATCH]: add ARCH=x86 workaround in scri..., Michael Renzmann, (Thu Jan 31, 10:28 am)