Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/23 11:42:25+00:00 nexus.co.uk!pb
install wnv.conf and hostap_cs.conf in pcmcia-cs

BKrev: 41a32233_afll909aIlljf3_9OIEYA

diff --git a/pcmcia-cs/files/hostap_cs.conf b/pcmcia-cs/files/hostap_cs.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/pcmcia-cs/pcmcia-cs_3.2.8.oe b/pcmcia-cs/pcmcia-cs_3.2.8.oe
index 7b95f88..71e41ab 100644 (file)
--- a/pcmcia-cs/pcmcia-cs_3.2.8.oe
+++ b/pcmcia-cs/pcmcia-cs_3.2.8.oe
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
           file://busybox.patch;patch=1 \
@@ -11,7 +11,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
           file://pcmcia \
           file://ide.opts \
           file://wireless.opts \
-          file://network.conf"
+          file://network.conf \
+          file://hostap_cs.conf \
+          file://wnv.conf \"
 S = "${WORKDIR}/pcmcia-cs-${PV}"
 
 INITSCRIPT_NAME = "pcmcia"
@@ -61,7 +63,11 @@ do_install() {
        install -d ${D}/${sysconfdir}/init.d \
                   ${D}/${sysconfdir}/pcmcia \
                   ${D}/${sysconfdir}/pcmcia/cis
+
        install -m 0644 ${WORKDIR}/network.conf ${D}/${sysconfdir}/pcmcia/
+       install -m 0644 ${WORKDIR}/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/
+       install -m 0644 ${WORKDIR}/wnv.conf ${D}/${sysconfdir}/pcmcia/
+
        for i in ${INSTALL_ETC}; do
                install etc/${i} ${D}/${sysconfdir}/pcmcia/
        done