aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/madwifi
diff options
context:
space:
mode:
authorLeon Woestenberg <leon@sidebranch.com>2009-04-27 01:44:04 +0200
committerLeon Woestenberg <leon@sidebranch.com>2009-04-27 20:52:44 +0200
commitf67b2104dafeda09571259ba4c3e6019d8a0888b (patch)
tree55f23badb2c71d2b54679ea6cb22ce0d6eef8ea8 /recipes/madwifi
parent2e90d22a167da2aaeb4dab1381e5a9fab702c575 (diff)
downloadopenembedded-f67b2104dafeda09571259ba4c3e6019d8a0888b.tar.gz
openembedded-f67b2104dafeda09571259ba4c3e6019d8a0888b.tar.bz2
openembedded-f67b2104dafeda09571259ba4c3e6019d8a0888b.zip
madwifi-ng_r3837: Use LDFLAGS to fix QA GNU_HASH issue.
Diffstat (limited to 'recipes/madwifi')
-rw-r--r--recipes/madwifi/files/respect-ldflags.patch39
-rw-r--r--recipes/madwifi/madwifi-ng_r.inc11
-rw-r--r--recipes/madwifi/madwifi-ng_r3837-20080802.bb4
3 files changed, 48 insertions, 6 deletions
diff --git a/recipes/madwifi/files/respect-ldflags.patch b/recipes/madwifi/files/respect-ldflags.patch
new file mode 100644
index 0000000000..1e5e360fae
--- /dev/null
+++ b/recipes/madwifi/files/respect-ldflags.patch
@@ -0,0 +1,39 @@
+Index: madwifi-trunk-r3837-20080802/Makefile
+===================================================================
+--- madwifi-trunk-r3837-20080802.orig/Makefile 2009-04-27 00:34:19.000000000 +0200
++++ madwifi-trunk-r3837-20080802/Makefile 2009-04-27 00:34:31.000000000 +0200
+@@ -61,7 +61,7 @@
+ $(MAKE) -C $$i || exit 1; \
+ done
+ else
+- $(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
++ $(MAKE) -C $(KERNELPATH) LDFLAGS= SUBDIRS=$(shell pwd) modules
+ endif
+
+ $(addprefix $(obj)/, $(obj-y:/=)): $(TOP)/svnversion.h
+Index: madwifi-trunk-r3837-20080802/tools/Makefile
+===================================================================
+--- madwifi-trunk-r3837-20080802.orig/tools/Makefile 2009-04-27 00:34:19.000000000 +0200
++++ madwifi-trunk-r3837-20080802/tools/Makefile 2009-04-27 00:34:36.000000000 +0200
+@@ -55,7 +55,7 @@
+ INCS = -I. -I$(HAL) -I$(TOP) -I$(ATH_HAL)
+ CFLAGS = -g -O2 -Wall
+ ALL_CFLAGS = $(CFLAGS) $(INCS)
+-LDFLAGS =
++#LDFLAGS =
+
+ all: all-subdirs $(PROGRAMS)
+
+Index: madwifi-trunk-r3837-20080802/tools/ath_info/Makefile
+===================================================================
+--- madwifi-trunk-r3837-20080802.orig/tools/ath_info/Makefile 2009-04-27 00:34:19.000000000 +0200
++++ madwifi-trunk-r3837-20080802/tools/ath_info/Makefile 2009-04-27 00:34:40.000000000 +0200
+@@ -5,7 +5,7 @@
+ USER_CROSS_COMPILE ?= $(CROSS_COMPILE)
+ CC = $(USER_CROSS_COMPILE)gcc
+ CFLAGS = -g -O2 -W -Wall
+-LDFLAGS =
++#LDFLAGS =
+ PREFIX = /usr/local
+ BINDIR = $(PREFIX)/bin
+ MANDIR = $(PREFIX)/share/man
diff --git a/recipes/madwifi/madwifi-ng_r.inc b/recipes/madwifi/madwifi-ng_r.inc
index 8fc3065eb9..59f8bc596f 100644
--- a/recipes/madwifi/madwifi-ng_r.inc
+++ b/recipes/madwifi/madwifi-ng_r.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "kernel (${KERNEL_VERSION})"
DEPENDS = "virtual/kernel"
-PR ="r5"
+PR ="r6"
WACKELF_SRC_URI = ""
WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1"
@@ -21,19 +21,19 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit module-base
-ARCH_efika="powerpc"
ARCH_dht-walnut="ppc"
+ARCH_efika="powerpc"
ARCH_magicbox="ppc"
+ARCH_mpc8313e-rdb="powerpc"
+ARCH_mpc8315e-rdb="powerpc"
ARCH_sequoia="ppc"
-EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}"
+EXTRA_OEMAKE = "KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}"
EXTRA_OEMAKE_prepend_ixp4xxle = "TARGET=xscale-le-elf "
EXTRA_OEMAKE_prepend_ixp4xxbe = "TARGET=xscale-be-elf "
-
do_compile() {
- unset LDFLAGS
oe_runmake all
}
@@ -61,3 +61,4 @@ fi
PACKAGES += "${PN}-modules ${PN}-tools"
FILES_${PN}-modules = "/lib/modules/"
FILES_${PN}-tools = "/usr/"
+
diff --git a/recipes/madwifi/madwifi-ng_r3837-20080802.bb b/recipes/madwifi/madwifi-ng_r3837-20080802.bb
index bf14c33f83..d79ff3cb9f 100644
--- a/recipes/madwifi/madwifi-ng_r3837-20080802.bb
+++ b/recipes/madwifi/madwifi-ng_r3837-20080802.bb
@@ -12,7 +12,9 @@ require madwifi-ng_r.inc
WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf-v2.patch;patch=1"
WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch;patch=1"
+SRC_URI += "file://respect-ldflags.patch;patch=1"
+
SRCNAME = "madwifi-trunk"
# PR set after the include, to override what's set in the included file.
-PR = "r1"
+PR = "r2"