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

into pot.orange:/mnt/space/firm/Zaurus/OpenEmbedded/openembedded

2005/04/22 23:34:02+01:00 orange!noodles
Teach pcmcia-cs to not do anything clever with socket 1 (the HD) on Spitz. Also
we force kill cardmgr rather than letting it cleanup, as if it tries to cleanup
it tries to free up the HD resources. Losing / on shutdown is not good. ;)

BKrev: 42697bfbx1cMUQYA0erjJNXLIm7c1Q

diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts.spitz b/packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts.spitz
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/nocleanup.patch b/packages/pcmcia-cs/pcmcia-cs-3.2.8/nocleanup.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 6b3895a..7c1bb84 100644 (file)
--- 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 = "r17"
+PR = "r18"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
           file://busybox.patch;patch=1 \
@@ -13,9 +13,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
           file://ratoc-cfu1u.patch;patch=1 \
           file://pcmcia \
           file://ide.opts \
+          file://ide.opts.spitz \
           file://wireless.opts \
           file://network.conf \
           file://wnv.conf"
+
+SRC_URI_append_spitz += " file://nocleanup.patch;patch=1"
 S = "${WORKDIR}/pcmcia-cs-${PV}"
 
 INITSCRIPT_NAME = "pcmcia"
@@ -80,7 +83,15 @@ do_install() {
        # ensure that config.opts always exists, albeit empty
        echo >> ${D}${sysconfdir}/pcmcia/config.opts
 
-       install -m 0644 ${WORKDIR}/ide.opts ${D}${sysconfdir}/pcmcia/
+       case ${MACHINE} in
+       spitz)
+               install -m 0644 ${WORKDIR}/ide.opts.spitz \
+                       ${D}${sysconfdir}/pcmcia/ide.opts
+               ;;
+       *)
+               install -m 0644 ${WORKDIR}/ide.opts ${D}${sysconfdir}/pcmcia/
+               ;;
+       esac
        install -m 0644 ${WORKDIR}/wireless.opts ${D}${sysconfdir}/pcmcia/
        for i in etc/cis/*; do
                install -m 0644 $i ${D}${sysconfdir}/pcmcia/cis/