merge of 7ba73700ed732b698e688443c1f964454f76f1e8

     and e1e48e54eacd0f943b35dcc20e6b52674bcd69f9

6 files changed, 36 insertions, 31 deletions

diff --git a/packages/sharp-binary-only/sharp-sdmmc-support.bb b/packages/sharp-binary-only/sharp-sdmmc-support.bb
new file mode 100644
index 0000000000..d54402efd3
--- /dev/null
+++ b/packages/sharp-binary-only/sharp-sdmmc-support.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Driver for the SHARP Zaurus SD/MMC Slot for linux ${KERNEL_VERSION}"
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "CLOSED"
+RDEPENDS = "kernel (${KERNEL_VERSION})"
+PV = "${KERNEL_VERSION}"
+PR = "r22"
+PACKAGE_ARCH = "${MACHINE}"
+
+SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r4.tar.bz2 \
+           file://sd \
+           file://sdmgr \
+           file://sdcontrol"
+
+S = "${WORKDIR}"
+
+inherit module-base update-rc.d
+
+INITSCRIPT_NAME = "sd"
+INITSCRIPT_PARAMS = "start 39 S . stop 96 0 1 6 ."
+
+do_install() {
+        install -d ${D}${sysconfdir}/init.d \
+                   ${D}${sysconfdir}/default \
+                   ${D}${base_sbindir} \
+                   ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
+                   
+        install -m 0755 ${WORKDIR}/sdmgr ${D}${base_sbindir}/
+        install -m 0755 ${WORKDIR}/sdcontrol ${D}${sysconfdir}
+        install -m 0755 ${WORKDIR}/sd ${D}${sysconfdir}/init.d/
+        install -m 0644 ${MACHINE}/sharp_mmcsd_m.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
+        echo "MODULE_FILE='${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/sharp_mmcsd_m.o'" > ${D}${sysconfdir}/default/sharp_sdmmc
+}
+
+FILES_${PN} = "/"
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/.mtn2git_empty b/packages/sharp-binary-only/sharp-sdmmc-support/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/.mtn2git_empty
+++ b/packages/sharp-binary-only/sharp-sdmmc-support/.mtn2git_empty
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sd b/packages/sharp-binary-only/sharp-sdmmc-support/sd
index e1c3d39ade..e1c3d39ade 100755..100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sd
+++ b/packages/sharp-binary-only/sharp-sdmmc-support/sd
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/sdcontrol
index 068d964726..068d964726 100755..100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
+++ b/packages/sharp-binary-only/sharp-sdmmc-support/sdcontrol
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdmgr b/packages/sharp-binary-only/sharp-sdmmc-support/sdmgr
index b487f07681..b487f07681 100755..100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdmgr
+++ b/packages/sharp-binary-only/sharp-sdmmc-support/sdmgr
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
deleted file mode 100644
index b84e0575af..0000000000
--- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Driver for the SHARP Zaurus SD/MMC Slot for linux ${PV}"
-SECTION = "kernel/modules"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "CLOSED"
-RDEPENDS = "kernel (${KERNEL_VERSION})"
-PR = "r21"
-
-SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r4.tar.bz2 \
-	   file://sd \
-	   file://sdmgr \
-	   file://sdcontrol"
-S = "${WORKDIR}"
-
-inherit module-base update-rc.d
-
-INITSCRIPT_NAME = "sd"
-INITSCRIPT_PARAMS = "start 39 S . stop 96 0 1 6 ."
-
-do_install() {
-	install -d ${D}${sysconfdir}/init.d ${D}${base_sbindir}
-	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
-	install -m 0755 ${WORKDIR}/sdmgr ${D}${base_sbindir}/
-	install -m 0755 ${WORKDIR}/sdcontrol ${D}${sysconfdir}
-	install -m 0755 ${WORKDIR}/sd ${D}${sysconfdir}/init.d/
-	install -m 0644 ${MACHINE}/sharp_mmcsd_m.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
-}
-
-FILES_${PN} = "/"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"