diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-04-12 16:21:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-04-12 16:21:31 +0000 |
| commit | 38f54bc7195393ef10d337f528e6f2fcc4027a22 (patch) | |
| tree | ed320b96d72b61b2e0d0b23353e014a844a0f97a /openembedded | |
| parent | a23e7eef388d31ddd902c801bf63e768d51d9de7 (diff) | |
| download | openembedded-core-38f54bc7195393ef10d337f528e6f2fcc4027a22.tar.gz openembedded-core-38f54bc7195393ef10d337f528e6f2fcc4027a22.tar.bz2 openembedded-core-38f54bc7195393ef10d337f528e6f2fcc4027a22.tar.xz openembedded-core-38f54bc7195393ef10d337f528e6f2fcc4027a22.zip | |
hostap: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@348 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
| -rw-r--r-- | openembedded/packages/hostap/hostap-modules.inc | 17 | ||||
| -rw-r--r-- | openembedded/packages/hostap/hostap-modules_0.3.9.bb | 2 | ||||
| -rw-r--r-- | openembedded/packages/hostap/hostap-utils.inc | 2 |
3 files changed, 8 insertions, 13 deletions
diff --git a/openembedded/packages/hostap/hostap-modules.inc b/openembedded/packages/hostap/hostap-modules.inc index 72f2dc2da..5ce5e0db6 100644 --- a/openembedded/packages/hostap/hostap-modules.inc +++ b/openembedded/packages/hostap/hostap-modules.inc @@ -3,13 +3,12 @@ SECTION = "kernel/modules" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PROVIDES = "hostap-conf" -RPROVIDES = "virtual/kernel-hostap" -SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ - file://hostap_cs.conf" +SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz" + SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" + SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " S = "${WORKDIR}/hostap-driver-${PV}" @@ -24,21 +23,17 @@ NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_cryp do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ - ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ - ${D}${sysconfdir}/pcmcia + ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia for i in ${NET_MODULES} do install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ done install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ - install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf - cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf } PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" FILES_hostap-modules = "/lib/modules/" -RDEPENDS_hostap-modules-cs = "hostap-modules" -RDEPENDS_hostap-modules-pci = "hostap-modules" -RPROVIDES_hostap-modules-cs = "hostap-conf" +RDEPENDS_hostap-modules-cs = "hostap-modules (${PV}) hostap-conf" +RDEPENDS_hostap-modules-pci = "hostap-modules (${PV})" diff --git a/openembedded/packages/hostap/hostap-modules_0.3.9.bb b/openembedded/packages/hostap/hostap-modules_0.3.9.bb index 508c65323..cc09fd595 100644 --- a/openembedded/packages/hostap/hostap-modules_0.3.9.bb +++ b/openembedded/packages/hostap/hostap-modules_0.3.9.bb @@ -1,5 +1,5 @@ include hostap-modules.inc -PR = "r9" +PR = "r10" SRC_URI += "file://Makefile.patch;patch=1 \ file://add_event.patch;patch=1 \ diff --git a/openembedded/packages/hostap/hostap-utils.inc b/openembedded/packages/hostap/hostap-utils.inc index c5c5d5b3f..1e4362d0f 100644 --- a/openembedded/packages/hostap/hostap-utils.inc +++ b/openembedded/packages/hostap/hostap-utils.inc @@ -4,7 +4,7 @@ SECTION = "kernel/userland" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -RRECOMMENDS = "virtual/kernel-hostap" +RRECOMMENDS = "hostap-modules" PR = "r3" SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ |