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

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/29 12:00:48+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2004/12/29 12:00:29+00:00 nexus.co.uk!pb
try to add support for 'below' directive in modules.conf


2004/12/29 12:58:12+01:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2004/12/29 12:58:01+01:00 handhelds.org!CoreDump
opie-ftp: Remove APPTYPE=binary as it is a quicjlauncher app

BKrev: 41d2a5a8hEZC6Mn76QZIVmre0WaTLQ

4 files changed, 28 insertions, 4 deletions

diff --git a/packages/busybox/busybox-1.00/below.patch b/packages/busybox/busybox-1.00/below.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.00/below.patch
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 6868bb4f45..5fff6fc71e 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
@@ -23,6 +23,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://readlink.patch;patch=1 \
 	   file://iproute-flush-cache.patch;patch=1;pnum=0 \
 	   file://rmmod.patch;patch=1 \
+	   file://below.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
 	   file://busybox-httpd \
diff --git a/packages/opie-ftp/opie-ftp_1.1.8.bb b/packages/opie-ftp/opie-ftp_1.1.8.bb
index e69de29bb2..1b063b4c2c 100644
--- a/packages/opie-ftp/opie-ftp_1.1.8.bb
+++ b/packages/opie-ftp/opie-ftp_1.1.8.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Opie-Ftp"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libopiecore2 opie-ftplib"
+I18N_FILES = "opieftp.ts"
+
+APPNAME = "opieftp"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieftp \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libopieftp.so* bin/opieftp pics/opieftp apps/Applications/opieftp.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
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 baccb3a0aa..7b92507e86 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
@@ -83,9 +83,7 @@ kill_task()
 case "$ACTION" in
 'insert')
 
-	# Get available partitions through dmesg. The "tail -1" is needed as
-	# sometimes the partitions are printed twice by the kernel.
-	#OK_PARTS="`dmesg | tail -3 | grep mmcda | tail -1| sed s/^.*\:\ //`"
+	# Read available partitions from /proc/partitions.
 	OK_PARTS="`cat /proc/partitions |awk '{print $4}'| grep mmcd`"
 	
 	if test "`echo "$OK_PARTS" | wc -l | awk '{print $1}`" -gt 1