From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 29 Jul 2004 09:30:37 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~17989
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c1b1a6c395d86fd49e551c5d25eaa4d53df26f3;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/29 00:09:42+02:00 uni-frankfurt.de!mickey
restructure the sharp-sdmmc support and update the collie module with the improved one

BKrev: 4108c3bdfzOkJZ55MtTmcSgphWIZ_g
---

diff --git a/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sharp-sdmmc-2.4.18.tar.gz b/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/collie/sharp_mmcsd_m.o
similarity index 100%
rename from sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sharp-sdmmc-2.4.18.tar.gz
rename to sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/collie/sharp_mmcsd_m.o
diff --git a/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/corgi/sharp_mmcsd_m.o b/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/corgi/sharp_mmcsd_m.o
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/husky/sharp_mmcsd_m.o b/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/husky/sharp_mmcsd_m.o
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/poodle/sharp_mmcsd_m.o b/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/poodle/sharp_mmcsd_m.o
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sd b/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sd
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol b/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdmgr b/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdmgr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/shepherd/sharp_mmcsd_m.o b/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/shepherd/sharp_mmcsd_m.o
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe b/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe
index 6ca4aae515..0ff0b64942 100644
--- a/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe
+++ b/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe
@@ -2,12 +2,13 @@ DESCRIPTION = "Driver for the SHARP Zaurus SD/MMC Slot for linux ${PV}"
 SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "CLOSED"
-PR = "r2"
+PR = "r3"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI = "file://sharp-sdmmc-2.4.18.tar.gz"
-S = "${WORKDIR}/sharp-sdmmc"
+SRC_URI = "file://sd \
+	   file://sdmgr \
+	   file://sdcontrol \
+	   file://sharp_mmcsd_m.o"
+S = "${WORKDIR}"
 
 inherit update-rc.d
 
@@ -15,9 +16,12 @@ INITSCRIPT_NAME = "sd"
 INITSCRIPT_PARAMS = "start 04 2 3 4 5 . stop 96 0 1 6 ."
 
 do_install() {
-	install -d ${D}/
-	cp -a etc lib sbin ${D}/
-	install -m 0644 modules/${MACHINE}.o ${D}/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o
+	install -d ${D}/etc/init.d ${D}/${sbindir}
+	install -d ${D}/lib/modules/${PV}/kernel/drivers/block/
+	install -m 0755 ${WORKDIR}/sdmgr ${D}/${sbindir}
+	install -m 0755 ${WORKDIR}/sdcontrol ${D}/${sysconfdir}
+	install -m 0755 ${WORKDIR}/sd ${D}/etc/init.d/
+	install -m 0644 ${WORKDIR}/sharp_mmcsd_m.o ${D}/lib/modules/${PV}/kernel/drivers/block/
 }
 
 FILES_${PN} = "/"