diff options
author | Michael Lauer <mickey@vanille-media.de> | 2004-06-29 18:48:49 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2004-06-29 18:48:49 +0000 |
commit | d24429abaa0c5de2ab8c2cc04d90fc1e670c47f8 (patch) | |
tree | a4cbb6ca6f87e3158d5e0ab7e97b3ca1ece96ba8 | |
parent | abc7ec1b99d2911ee3168349e3d370e954f44641 (diff) |
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages
2004/06/29 20:48:42+02:00 uni-frankfurt.de!mickey
- apply busybox-compliance patch to pcmcia-cs
- install our versions of ide.opts and wireless.opts
BKrev: 40e1b991R3lorKE9pkGuevOI8WB85A
-rw-r--r-- | pcmcia-cs/pcmcia-cs-3.2.7/busybox.patch | 0 | ||||
-rw-r--r-- | pcmcia-cs/pcmcia-cs-3.2.7/ide.opts | 0 | ||||
-rw-r--r-- | pcmcia-cs/pcmcia-cs-3.2.7/wireless.opts | 0 | ||||
-rw-r--r-- | pcmcia-cs/pcmcia-cs_3.2.7.oe | 11 |
4 files changed, 8 insertions, 3 deletions
diff --git a/pcmcia-cs/pcmcia-cs-3.2.7/busybox.patch b/pcmcia-cs/pcmcia-cs-3.2.7/busybox.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/pcmcia-cs/pcmcia-cs-3.2.7/busybox.patch diff --git a/pcmcia-cs/pcmcia-cs-3.2.7/ide.opts b/pcmcia-cs/pcmcia-cs-3.2.7/ide.opts new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/pcmcia-cs/pcmcia-cs-3.2.7/ide.opts diff --git a/pcmcia-cs/pcmcia-cs-3.2.7/wireless.opts b/pcmcia-cs/pcmcia-cs-3.2.7/wireless.opts new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/pcmcia-cs/pcmcia-cs-3.2.7/wireless.opts diff --git a/pcmcia-cs/pcmcia-cs_3.2.7.oe b/pcmcia-cs/pcmcia-cs_3.2.7.oe index 24af162e81..bd683efa3c 100644 --- a/pcmcia-cs/pcmcia-cs_3.2.7.oe +++ b/pcmcia-cs/pcmcia-cs_3.2.7.oe @@ -3,9 +3,12 @@ SECTION = "base" PRIORITY = "required" LICENSE = "GPL" DEPENDS = "virtual/kernel" -PR = "r1" +PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \ + file://busybox.patch;patch=1 \ + file://ide.opts \ + file://wireless.opts" S = "${WORKDIR}/pcmcia-cs-${PV}" INITSCRIPT_NAME = "pcmcia" @@ -44,7 +47,7 @@ do_compile() { } INSTALL_ETC = "ftl ide ieee1394 memory network parport scsi serial wireless" -INSTALL_ETC_DATA = "config config.opts ftl.opts ide.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared wireless.opts" +INSTALL_ETC_DATA = "config config.opts ftl.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared" do_install() { install -d ${D}/${sbindir} @@ -61,6 +64,8 @@ do_install() { for i in ${INSTALL_ETC_DATA}; do install -m 0644 etc/${i} ${D}/${sysconfdir}/pcmcia/ done + install -m 0644 ${WORKDIR}/ide.opts ${D}/${sysconfdir}/pcmcia/ + install -m 0644 ${WORKDIR}/wireless.opts ${D}/${sysconfdir}/pcmcia/ for i in etc/cis/*; do install -m 0644 $i ${D}/${sysconfdir}/pcmcia/cis/ done |