From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 8 Feb 2006 15:38:08 +0000 (+0000)
Subject: sharp-sdmmc-support: added some tweaks to fix #653
X-Git-Tag: Release-2010-05/1~9453^2~2400^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1629da56a64f1323816dbe9d051b82c8348bb6f2;p=openembedded.git

sharp-sdmmc-support: added some tweaks to fix #653
- /etc/init.d/sd use insmod instead of modprobe to load module
  (we do not have modules.dep at this moment)
- module filename is defined in /etc/default/sharp_sdmmc
- renamed recipe as it give false info being only for 2.4.18
- PV of package is set correct to KERNEL_VERSION
  (no more 2.4.18-rmk7-pxa3-embedix on 2.4.20 machines)
taken from .oz354fam083
---

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
similarity index 100%
rename from packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/.mtn2git_empty
rename to 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
old mode 100755
new mode 100644
similarity index 100%
rename from packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sd
rename to 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
old mode 100755
new mode 100644
similarity index 100%
rename from packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
rename to 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
old mode 100755
new mode 100644
similarity index 100%
rename from packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdmgr
rename to 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}"