[oe-commits] org.oe.dev wlan-ng: fixing to get it build and updated - close #1260
hrw commit
openembedded-commits at lists.openembedded.org
Wed Aug 23 11:19:11 UTC 2006
wlan-ng: fixing to get it build and updated - close #1260
- added 0.2.4+svn20060823
- bumped SVN to 0.2.4
- SVN are DEFAULT_PREFERENCE = -1 now
- dropped pcmcia-driver.patch from wlan-ng-modules.inc
- for PCMCIA cards we use HostAP not wlan-ng
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 99d4c960758f8db7a224500ef5d1acd1663ceec0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=99d4c960758f8db7a224500ef5d1acd1663ceec0
Files:
1
packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823
packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823
packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch
packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in
packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
packages/wlan-ng/wlan-ng-modules.inc
packages/wlan-ng/wlan-ng-modules_svn.bb
packages/wlan-ng/wlan-ng-utils_svn.bb
Diffs:
#
# mt diff -r55b7a5bb1a6c6120907d2914981212e3939a08d8 -r99d4c960758f8db7a224500ef5d1acd1663ceec0
#
#
#
# add_dir "packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823"
#
# add_dir "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823"
#
# add_file "packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch"
# content [c6f7565289a40fd28eda76c11ae8e338956d78a4]
#
# add_file "packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb"
# content [a69633a4d6942c8928d51b240144b359c7876a26]
#
# add_file "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in"
# content [d6b6dcf6ace7f6a1076a0e0617a6027eccf8297f]
#
# add_file "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch"
# content [e56c3bf90ae7d569fbfbbea1b3c299382b228fc6]
#
# add_file "packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb"
# content [33b9b0a18e8b4817e1e039fd529d1211ac6d1402]
#
# patch "packages/wlan-ng/wlan-ng-modules.inc"
# from [f119724b000ec8171708dab7818e2e5e022e8d8d]
# to [66eb06326ed0d56dcedb2a13cd6a336c3e062d4e]
#
# patch "packages/wlan-ng/wlan-ng-modules_svn.bb"
# from [794484a3c41dd6bf98a9f30bc5a88cd84461eb5b]
# to [81e83b49cc5c22b8e3737339843390121d244a92]
#
# patch "packages/wlan-ng/wlan-ng-utils_svn.bb"
# from [40b369b5e936e5cbcdaff43762cc2d991b36af06]
# to [ff329d27d0312c31857ee57d5861d096c11fce58]
#
============================================================
--- packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch c6f7565289a40fd28eda76c11ae8e338956d78a4
+++ packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch c6f7565289a40fd28eda76c11ae8e338956d78a4
@@ -0,0 +1,26 @@
+Index: trunk/src/Makefile
+===================================================================
+--- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200
++++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200
+@@ -44,7 +44,7 @@
+
+ -include ../config.mk
+
+-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
++DIRS=mkmeta shared p80211 prism2
+
+ ifneq ($(wildcard *.addon),)
+ DIRS+=`cat *.addon`
+Index: trunk/src/prism2/Makefile
+===================================================================
+--- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200
++++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200
+@@ -44,7 +44,7 @@
+
+ -include ../../config.mk
+
+-DIRS=driver ridlist download
++DIRS=driver ridlist
+
+ ifneq ($(wildcard *.addon),)
+ DIRS+=`cat *.addon`
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb a69633a4d6942c8928d51b240144b359c7876a26
+++ packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb a69633a4d6942c8928d51b240144b359c7876a26
@@ -0,0 +1,8 @@
+require wlan-ng-modules.inc
+
+SRCDATE = "20060823"
+PV = "0.2.4+svn${SRCDATE}"
+
+SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
+S = "${WORKDIR}/trunk"
+
============================================================
--- packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in d6b6dcf6ace7f6a1076a0e0617a6027eccf8297f
+++ packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in d6b6dcf6ace7f6a1076a0e0617a6027eccf8297f
@@ -0,0 +1,21 @@
+WLAN_VERSION=0
+WLAN_PATCHLEVEL=2
+WLAN_SUBLEVEL=3
+WLAN_EXTRAVERSION=
+#LINUX_SRC=$(KERNEL_SOURCE)
+PCMCIA_SRC=.
+PREFIX=
+INST_EXEDIR=/sbin
+#TARGET_ROOT_ON_HOST=
+#RC_DIR=/etc/init.d
+PCMCIA_DIR=/etc/pcmcia
+SYSV_INIT=y
+INSTALL_DEPMOD=
+WLAN_DEBUG=n
+CROSS_COMPILE_ENABLED=n
+CROSS_COMPILE=
+HOST_COMPILE=
+PRISM2_PLX=y
+PRISM2_PCMCIA=y
+PRISM2_PCI=y
+PRISM2_USB=y
============================================================
--- packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch e56c3bf90ae7d569fbfbbea1b3c299382b228fc6
+++ packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch e56c3bf90ae7d569fbfbbea1b3c299382b228fc6
@@ -0,0 +1,26 @@
+Index: trunk/src/Makefile
+===================================================================
+--- trunk.orig/src/Makefile 2006-08-21 16:24:58.000000000 +0200
++++ trunk/src/Makefile 2006-08-23 12:49:08.000000000 +0200
+@@ -44,7 +44,7 @@
+
+ -include ../config.mk
+
+-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2
+
+ ifneq ($(wildcard *.addon),)
+ DIRS+=`cat *.addon`
+Index: trunk/src/prism2/Makefile
+===================================================================
+--- trunk.orig/src/prism2/Makefile 2006-08-21 16:24:57.000000000 +0200
++++ trunk/src/prism2/Makefile 2006-08-23 12:48:32.000000000 +0200
+@@ -44,7 +44,7 @@
+
+ -include ../../config.mk
+
+-DIRS=driver ridlist download
++DIRS=ridlist download
+
+ ifneq ($(wildcard *.addon),)
+ DIRS+=`cat *.addon`
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb 33b9b0a18e8b4817e1e039fd529d1211ac6d1402
+++ packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb 33b9b0a18e8b4817e1e039fd529d1211ac6d1402
@@ -0,0 +1,72 @@
+DESCRIPTION = "linux-wlan-ng userland utilities"
+HOMEPAGE = "http://www.linux-wlan.org"
+SECTION = "kernel/userland"
+DEPENDS = "virtual/kernel"
+LICENSE = "GPL"
+
+SRCDATE = "20060823"
+PV = "0.2.4+svn${SRCDATE}"
+
+SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
+ file://only-the-utils.patch;patch=1 \
+ file://scripts-makefile-hostcc.patch;patch=1 \
+ file://pcmciasrc.patch;patch=1 \
+ file://hostldflags.patch;patch=1 \
+ file://wlan-ng.modutils \
+ file://wlan.agent \
+ file://usbctl \
+ file://resume \
+ file://pre-up \
+ file://post-down \
+ file://config.in"
+S = "${WORKDIR}/trunk"
+
+# yeah, it's kind of backwards, but otherwise the config step will fail
+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 "FIRMWARE_DIR=/etc/wlan" >> config.mk
+ echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
+ echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk
+ echo "RC_DIR=${sysconfdir}/" >> config.mk
+ echo "CC=${CC}" >> config.mk
+ echo "LD=${LD}" >> config.mk
+
+ # Shut up, you broken buildsystem
+ 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
+ mkdir -p ${D}${sysconfdir}/modutils/
+ mkdir -p ${D}${sysconfdir}/hotplug/
+ mkdir -p ${D}${base_sbindir}/
+ install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
+ install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
+ install -d ${D}${sysconfdir}/network/if-pre-up.d
+ install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
+ install -d ${D}${sysconfdir}/network/if-post-down.d
+ install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
+ install -d ${D}${sysconfdir}/apm/resume.d
+ install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
+ install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
+ install -d ${D}${mandir}/man1
+ install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
+}
+
+FILES_${PN} = "/etc /sbin"
============================================================
--- packages/wlan-ng/wlan-ng-modules.inc f119724b000ec8171708dab7818e2e5e022e8d8d
+++ packages/wlan-ng/wlan-ng-modules.inc 66eb06326ed0d56dcedb2a13cd6a336c3e062d4e
@@ -13,7 +13,6 @@ SRC_URI = "file://no-compat.patch;patch=
# file://module_param_array.patch;patch=1 \
file://scripts-makefile-hostcc.patch;patch=1 \
file://pcmciasrc.patch;patch=1 \
- file://pcmcia-driver.patch;patch=1 \
file://config.in"
inherit module
============================================================
--- packages/wlan-ng/wlan-ng-modules_svn.bb 794484a3c41dd6bf98a9f30bc5a88cd84461eb5b
+++ packages/wlan-ng/wlan-ng-modules_svn.bb 81e83b49cc5c22b8e3737339843390121d244a92
@@ -1,7 +1,10 @@ PR = "r0"
require wlan-ng-modules.inc
PR = "r0"
-PV = "0.2.3+svn${SRCDATE}"
+PV = "0.2.4+svn${SRCDATE}"
SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
S = "${WORKDIR}/trunk"
+DEFAULT_PREFERENCE = "-1"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-modules' ], d)}"
============================================================
--- packages/wlan-ng/wlan-ng-utils_svn.bb 40b369b5e936e5cbcdaff43762cc2d991b36af06
+++ packages/wlan-ng/wlan-ng-utils_svn.bb ff329d27d0312c31857ee57d5861d096c11fce58
@@ -1,10 +1,10 @@ PR = "r2"
DESCRIPTION = "linux-wlan-ng userland utilities"
HOMEPAGE = "http://www.linux-wlan.org"
SECTION = "kernel/userland"
DEPENDS = "virtual/kernel"
LICENSE = "GPL"
PR = "r2"
-PV = "0.2.3+svn${SRCDATE}"
+PV = "0.2.4+svn${SRCDATE}"
SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
file://only-the-utils.patch;patch=1 \
@@ -69,3 +69,7 @@ FILES_${PN} = "/etc /sbin"
}
FILES_${PN} = "/etc /sbin"
+
+DEFAULT_PREFERENCE = "-1"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-utils' ], d)}"
More information about the Openembedded-commits
mailing list