Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/06 02:26:55+02:00 uni-frankfurt.de!mickeyl
revamp the wlan-ng-modules build strategy and make it a bit more sane by splitting into a -modules and a -utils bb. It is still horrible, but at least more predictable and maintenable.

BKrev: 427b3b6f_8sRY2bKmZ6dWXppSdh5pQ

diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
index e69de29..95d764d 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11Mbps wireless lan cards"
+HOMEPAGE = "http://www.linux-wlan.org"
+SECTION = "kernel/modules"
+DEPENDS = "virtual/kernel"
+RRECOMMENDS = "wlan-ng-utils"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+       file://no-compat.patch;patch=1 \
+       file://only-the-modules.patch;patch=1 \
+       file://config.in"
+S = "${WORKDIR}/linux-wlan-ng-${PV}"
+
+inherit module
+
+do_configure() {
+       install -m 0655 ${WORKDIR}/config.in ${S}/config.in
+       oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
+
+        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
+                echo "PRISM2_PCMCIA=y"          >> config.mk
+                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
+        fi
+        echo "TARGET_ROOT_ON_HOST=${D}/"         >> config.mk
+        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
+       echo "CC=${KERNEL_CC}"                  >> config.mk
+       echo "LD=${KERNEL_LD}"                  >> config.mk
+
+       # Listen closely... sssshhh... can you hear the wlan-ng build system suck?
+       rm -f ${KERNEL_SOURCE}/../config.mk
+       rm -f ${KERNEL_SOURCE}/../../config.mk
+       ln -sf ${S}/config.mk   ${KERNEL_SOURCE}/..
+       ln -sf ${S}/config.mk   ${KERNEL_SOURCE}/../..
+       install -m 0655 config.mk src/prism2/config.mk
+       install -d src/prism2/driver/include
+       ln -sf ${S}/src/include/wlan            src/prism2/driver/include/wlan
+       ln -sf ${S}/src/prism2/include/prism2   src/prism2/driver/include/prism2
+}
+
+do_compile() {
+       oe_runmake all
+}
+
+do_install() {
+       oe_runmake install DESTDIR=${D}
+
+        # Listen closely... sssshhh... can you hear the wlan-ng build system suck?
+        rm -f ${KERNEL_SOURCE}/../config.mk
+        rm -f ${KERNEL_SOURCE}/../../config.mk 
+}
+
+FILES_${PN} = "/lib"

diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
new file mode 100644 (file)
index 0000000..e69de29