From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 6 Oct 2004 11:19:16 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~16718
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4abd898930587a870ded7755f39cff04cec46c76;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/06 10:27:04+02:00 (none)!br1
wlan-ng update to 0.2.1pre22, with a more flexible configuration

2004/10/06 10:23:31+02:00 (none)!br1
madwifi fix for mtx-1

2004/10/06 05:27:18+02:00 local!CoreDump
Bump PR to replace -r1 (borked DEPENDS) from the upgrade feed

BKrev: 4163d4b4Uk_QgVNrKdlYXCoR8W_oug
---

diff --git a/knights/knights_1.14.oe b/knights/knights_1.14.oe
index 9ef9ea6a1c..74352c588d 100644
--- a/knights/knights_1.14.oe
+++ b/knights/knights_1.14.oe
@@ -6,13 +6,13 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "phalanx"
 
-PR = "r1"
-
 SRC_URI = "http://www.houseoffish.org/knights/downloads/knights.tar.gz \
            file://libqpe-opie.patch;patch=1 \
            file://gcc3.patch;patch=1"
 S = "${WORKDIR}/knights"
 
+PR = "r2"
+
 inherit palmtop
 
 QMAKE_PROFILES = "knights.pro"
diff --git a/madwifi/madwifi-modules_cvs.oe b/madwifi/madwifi-modules_cvs.oe
index 86cf0b09e4..ed325ddbc9 100644
--- a/madwifi/madwifi-modules_cvs.oe
+++ b/madwifi/madwifi-modules_cvs.oe
@@ -14,7 +14,8 @@ inherit module-base
 
 # Hack Alert :D
 ARCH_mipsel = "mips"
-EXTRA_OEMAKE_mtx-1 = "TARGET=mips-le-elf KERNELPATH=${KERNEL_SOURCE} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX} COPTS='-G 0 -mno-abicalls -fno-pic -Wa,--trap -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls'"
+EXTRA_OEMAKE_mtx-1 = "TARGET=mips-le-elf KERNELPATH=${KERNEL_SOURCE} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX} \
+COPTS='-G 0 -mno-abicalls -fno-pic -Wa,--trap -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls -DATH_PCI'"
 
 do_compile() {
 	oe_runmake
diff --git a/wlan-ng/files/config.in b/wlan-ng/files/config.in
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/wlan-ng/files/scripts-makefile-hostcc.diff b/wlan-ng/files/scripts-makefile-hostcc.diff
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/wlan-ng/wlan-ng-modules_0.2.1pre21.oe b/wlan-ng/wlan-ng-modules_0.2.1pre21.oe
index 5186043f43..f1aa357c0d 100644
--- a/wlan-ng/wlan-ng-modules_0.2.1pre21.oe
+++ b/wlan-ng/wlan-ng-modules_0.2.1pre21.oe
@@ -6,14 +6,14 @@ PR = "r4"
 
 
 SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-		file://no-compat.patch;patch=1 \
-	   file://Ambit_usb.patch;patch=1 \
-	   file://config.mk \
-		file://wlan-ng.modutils \
-		file://wlan.agent \
-	   file://version.h \
-	   file://sl6kwlanctl-ng \
-	   file://usbctl"
+	file://no-compat.patch;patch=1 \
+	file://Ambit_usb.patch;patch=1 \
+	file://config.mk \
+	file://wlan-ng.modutils \
+	file://wlan.agent \
+	file://version.h \
+	file://sl6kwlanctl-ng \
+	file://usbctl"
 S = "${WORKDIR}/linux-wlan-ng-${PV}"
 
 inherit module
diff --git a/wlan-ng/wlan-ng-modules_0.2.1pre22.oe b/wlan-ng/wlan-ng-modules_0.2.1pre22.oe
new file mode 100644
index 0000000000..e69de29bb2