diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-01-26 21:34:38 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2005-01-26 21:34:38 +0000 |
| commit | f46fa48c0e349f42b6a0103c216c8ec50b033766 (patch) | |
| tree | 89923800b827bb506dfab3edc39aa101ccfc133e | |
| parent | 55e0bbf9a5f2e4c24119d3879ba3f70000134403 (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/01/26 22:34:11+01:00 uni-frankfurt.de!mickeyl
repair pcmcia init script (was looking for /sbin/pidof instead of /bin/pidof)
BKrev: 41f80ceewK_3OifoT8JRgDNP8eeRDg
| -rw-r--r-- | packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch | 33 | ||||
| -rw-r--r-- | packages/pcmcia-cs/pcmcia-cs_3.2.8.bb | 6 |
2 files changed, 38 insertions, 1 deletions
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch b/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch index e69de29bb2..e78d0c5c6b 100644 --- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch +++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch @@ -0,0 +1,33 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- pcmcia-cs-3.2.8/etc/rc.pcmcia~pcic-extra ++++ pcmcia-cs-3.2.8/etc/rc.pcmcia +@@ -105,10 +105,16 @@ + echo "using yenta_socket instead of $PCIC") || + /sbin/modprobe $PCIC $PCIC_OPTS || break + /sbin/modprobe ds || break ++ if [ "x$PCIC_EXTRA" != "x" ]; then ++ /sbin/modprobe $PCIC_EXTRA ++ fi + elif [ -d $PC ] ; then + /sbin/insmod $PC/pcmcia_core.o $CORE_OPTS + /sbin/insmod $PC/$PCIC.o $PCIC_OPTS + /sbin/insmod $PC/ds.o ++ if [ "x$PCIC_EXTRA" != "x" ]; then ++ /sbin/insmod $PC/$PCIC_EXTRA ++ fi + else + echo "module directory $PC not found." + break +@@ -154,7 +160,7 @@ + ;; + + status) +- pid=`/sbin/pidof cardmgr` ++ pid=`/bin/pidof cardmgr` + if [ "$pid" != "" ] ; then + echo "cardmgr (pid $pid) is running..." + EXITCODE=0 diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb index 982bcfdfa4..7a20ccc2bf 100644 --- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb +++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "required" LICENSE = "GPL" DEPENDS = "virtual/kernel" -PR = "r14" +PR = "r15" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \ file://busybox.patch;patch=1 \ @@ -75,6 +75,10 @@ do_install() { for i in ${INSTALL_ETC_DATA}; do install -m 0644 etc/${i} ${D}/${sysconfdir}/pcmcia/ done + + # ensure that config.opts always exists, albeit empty + echo >> ${D}/${sysconfdir}/pcmcia/config.opts + install -m 0644 ${WORKDIR}/ide.opts ${D}/${sysconfdir}/pcmcia/ install -m 0644 ${WORKDIR}/wireless.opts ${D}/${sysconfdir}/pcmcia/ for i in etc/cis/*; do |