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

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

2004/12/29 12:35:06+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/12/29 12:34:53+01:00 uni-frankfurt.de!mickeyl
install sysvinit-pidof with task-bootstrap

2004/12/29 12:17:08+01:00 handhelds.org!CoreDump
sdcontrol: Read available partition from /proc/partitions. This fixes failed mounts after flashing.

BKrev: 41d29796GXWRReDs9Gn88Uyd9Upd3g

diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index fcdbdb7..870b1d2 100644 (file)
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Core packages required for a basic installation"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r14"
+PR = "r15"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
 # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
@@ -40,7 +40,7 @@ DEPENDS = 'base-files base-passwd-3.5.7 \
 
 RDEPENDS = 'base-files base-passwd busybox \
        hotplug initscripts \
-       netbase sysvinit tinylogin \
+       netbase sysvinit sysvinit-pidof tinylogin \
        modutils-initscripts \
        ${BOOTSTRAP_EXTRA_RDEPENDS} \
        ${@bootstrap_modutils_rdepends(d)}'

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 1639945..baccb3a 100644 (file)
--- 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
@@ -85,7 +85,14 @@ case "$ACTION" in
 
        # 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/^.*\:\ //`"
+       #OK_PARTS="`dmesg | tail -3 | grep mmcda | tail -1| sed s/^.*\:\ //`"
+       OK_PARTS="`cat /proc/partitions |awk '{print $4}'| grep mmcd`"
+       
+       if test "`echo "$OK_PARTS" | wc -l | awk '{print $1}`" -gt 1
+       then
+               OK_PARTS="`echo "$OK_PARTS" | grep -v "^mmcda$"`"
+       fi
+       
        echo "Valid SD partitions are: [$OK_PARTS]"
        
        # Allow for "#" in fstab.

diff --git a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
index 2036884..b5a93a3 100644 (file)
--- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "CLOSED"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix.tar.bz2 \
           file://sd \