From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Wed, 29 Dec 2004 10:40:08 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15545
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96256caa9440f67406831efadd79194f7ceb4c54;p=openembedded.git

Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/29 11:16:27+01:00 handhelds.org!CoreDump
sdcontrol: Create missing device-files on the fly

2004/12/29 11:14:17+01:00 handhelds.org!CoreDump
opie-zkbapplet: Nuke obsolete postinst from _cvs .bb

BKrev: 41d28988H5161wfPcVJCImWZ6rWSpg
---

diff --git a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
index 9c3a20eb47..1ea3196a4d 100644
--- a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
+++ b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
@@ -18,12 +18,6 @@ S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-pkg_postinst() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-test -f $OPIEDIR/share/zkb/zkb.xml || cp $OPIEDIR/share/zkb/zkb.xml.sample $OPIEDIR/share/zkb/zkb.xml
-}
-
 do_install() {
         install -d ${D}${palmtopdir}/pics/
         install -d ${D}${palmtopdir}/share/zkb/
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
index 876f365363..1639945ade 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
+++ b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
@@ -139,6 +139,12 @@ case "$ACTION" in
 		! test -d $MOUNT_POINT && mkdir -p $MOUNT_POINT	
 			
 		DEVICE="/dev/$part"
+		if ! test -e "$DEVICE"
+		then
+			DEV_NUM="`echo "$DEVICE" | sed -n "s/.*\([0-9]\)/\1/p"`"
+			cd /dev			
+			mknod mmcda$DEV_NUM b 60 $DEV_NUM
+		fi
 		
 		echo "Mounting [/dev/$part]"
 		echo "* Trying VFAT mount [$SD_OPTS_VFAT]..."