summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-01-17 16:58:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-18 13:28:07 +0000
commitfb7ea95fc367728f4fcfb0da4f5779e3d19df1bc (patch)
tree1806068f4a6884c4c1185108c9c0d528d3aa01f0
parent950704e392b7888aa6a49fd4273c2eca8b9b6c1e (diff)
downloadpoky-fb7ea95fc367728f4fcfb0da4f5779e3d19df1bc.tar.gz
hostap-conf: remove dependencies of update-modules
Also: * install the alias file in the correct /etc/modprobe.d directory since this is the directory used by modprobe now; * rewrite the alias file to be up-to-date with modprobe's syntax; * remove the postinst/postrm scriptlets because this is just an alias file; [YOCTO #3598] (From OE-Core rev: 427010fd289534d4b4af0bfd74419a4ad0eb5a39) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/hostap/files/hostap_cs.modalias34
-rw-r--r--meta/recipes-bsp/hostap/hostap-conf_1.0.bb17
2 files changed, 20 insertions, 31 deletions
diff --git a/meta/recipes-bsp/hostap/files/hostap_cs.modalias b/meta/recipes-bsp/hostap/files/hostap_cs.modalias
index cb9efab271..2848351510 100644
--- a/meta/recipes-bsp/hostap/files/hostap_cs.modalias
+++ b/meta/recipes-bsp/hostap/files/hostap_cs.modalias
@@ -1,28 +1,28 @@
1# product info: "Pretec", "CompactWLAN Card 802.11b", "2.5" 1# product info: "Pretec", "CompactWLAN Card 802.11b", "2.5"
2pcmcia:m0156c0002f06fn00pfn00pa1CADD3E5pbE697636Cpc7A5BFCF1pd00000000 hostap_cs 2alias pcmcia:m0156c0002f06fn00pfn00pa1CADD3E5pbE697636Cpc7A5BFCF1pd00000000 hostap_cs
3 3
4# manufacturer ID which exist in orinoco_cs AND in hostap_cs 4# manufacturer ID which exist in orinoco_cs AND in hostap_cs
5pcmcia:m000Bc7100f06fn00pfn00pa*pb*pc*pd* hostap_cs 5alias pcmcia:m000Bc7100f06fn00pfn00pa*pb*pc*pd* hostap_cs
6pcmcia:m000Bc7300f06fn00pfn00pa*pb*pc*pd* hostap_cs 6alias pcmcia:m000Bc7300f06fn00pfn00pa*pb*pc*pd* hostap_cs
7pcmcia:m0126c8000f06fn00pfn00pa*pb*pc*pd* hostap_cs 7alias pcmcia:m0126c8000f06fn00pfn00pa*pb*pc*pd* hostap_cs
8pcmcia:m0138c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs 8alias pcmcia:m0138c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs
9pcmcia:m0250c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs 9alias pcmcia:m0250c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs
10pcmcia:m0274c1612f06fn00pfn00pa*pb*pc*pd* hostap_cs 10alias pcmcia:m0274c1612f06fn00pfn00pa*pb*pc*pd* hostap_cs
11pcmcia:m0274c1613f06fn00pfn00pa*pb*pc*pd* hostap_cs 11alias pcmcia:m0274c1613f06fn00pfn00pa*pb*pc*pd* hostap_cs
12pcmcia:m028Ac0002f06fn00pfn00pa*pb*pc*pd* hostap_cs 12alias pcmcia:m028Ac0002f06fn00pfn00pa*pb*pc*pd* hostap_cs
13pcmcia:m02AAc0002f06fn00pfn00pa*pb*pc*pd* hostap_cs 13alias pcmcia:m02AAc0002f06fn00pfn00pa*pb*pc*pd* hostap_cs
14pcmcia:m50C2c7300f06fn00pfn00pa*pb*pc*pd* hostap_cs 14alias pcmcia:m50C2c7300f06fn00pfn00pa*pb*pc*pd* hostap_cs
15pcmcia:mD601c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs 15alias pcmcia:mD601c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs
16pcmcia:mD601c0005f06fn00pfn00pa*pb*pc*pd* hostap_cs 16alias pcmcia:mD601c0005f06fn00pfn00pa*pb*pc*pd* hostap_cs
17 17
18# product info: "Linksys", "Wireless CompactFlash Card", "", "" 18# product info: "Linksys", "Wireless CompactFlash Card", "", ""
19pcmcia:m028Ac0673f06fn00pfn00pa0733CC81pb0C52F395pc00000000pd00000000 hostap_cs 19alias pcmcia:m028Ac0673f06fn00pfn00pa0733CC81pb0C52F395pc00000000pd00000000 hostap_cs
20 20
21# product info:"PLANEX COMMUNICATION INC","PLANEX GW-CF11X Wireless CF Card", "", "" 21# product info:"PLANEX COMMUNICATION INC","PLANEX GW-CF11X Wireless CF Card", "", ""
22pcmcia:mD601c0010f06fn00pfn00pa4703CF68pbFAD7318Dpc00000000pd00000000 hostap_cs 22alias pcmcia:mD601c0010f06fn00pfn00pa4703CF68pbFAD7318Dpc00000000pd00000000 hostap_cs
23 23
24# 0x0156, 0x0002 and "Version 01.02" only appear for Prism based cards. 24# 0x0156, 0x0002 and "Version 01.02" only appear for Prism based cards.
25pcmcia:m0156c0002f06fn00pfn00pa*pb*pc4B74BAA0pd00000000 hostap_cs 25alias pcmcia:m0156c0002f06fn00pfn00pa*pb*pc4B74BAA0pd00000000 hostap_cs
26 26
27# "BUFFALO", "WLI-CF-S11G", "", "" 27# "BUFFALO", "WLI-CF-S11G", "", ""
28pcmcia:m026Fc030Bf06fn00pfn00pa2DECECE3pb82067C18pc00000000pd00000000 hostap_cs 28alias pcmcia:m026Fc030Bf06fn00pfn00pa2DECECE3pb82067C18pc00000000pd00000000 hostap_cs
diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index f8b2102328..466c073cc1 100644
--- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
+++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Int
2SECTION = "kernel/modules" 2SECTION = "kernel/modules"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5RDEPENDS_${PN} = "update-modules" 5PR = "r15"
6PR = "r14"
7 6
8SRC_URI = "file://hostap_cs.modalias \ 7SRC_URI = "file://hostap_cs.modalias \
9 file://COPYING.patch" 8 file://COPYING.patch"
@@ -14,18 +13,8 @@ do_compile() {
14} 13}
15 14
16do_install() { 15do_install() {
17 install -d ${D}${sysconfdir}/modutils 16 install -d ${D}${sysconfdir}/modprobe.d
18 17
19 install -m 0644 ${WORKDIR}/hostap_cs.modalias ${D}${sysconfdir}/modutils/hostap_cs.conf 18 install -m 0644 ${WORKDIR}/hostap_cs.modalias ${D}${sysconfdir}/modprobe.d/hostap_cs.conf
20} 19}
21 20
22pkg_postinst_${PN} () {
23 if [ -n "$D" ]; then
24 exit 1
25 fi
26 update-modules || true
27}
28
29pkg_postrm_${PN} () {
30 update-modules || true
31}