From: Michael Lauer Date: Mon, 11 Oct 2004 15:27:01 +0000 (+0000) Subject: Merge bk://openembedded@openembedded.bkbits.net/packages X-Git-Tag: Release-2010-05/1~16657 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96379cf2ff7c66a2ab2f1e57e17c88b9860e5c75;p=openembedded.git Merge bk://openembedded@openembedded.bkbits.net/packages into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/10/11 17:26:48+02:00 uni-frankfurt.de!mickeyl remove the binary camera module and put the drivers to openzaurus.org BKrev: 416aa645oz9jXdA8XGBQsHDKngaXHg --- diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone index a6c2255a8f..6c43b4712b 100644 --- a/BitKeeper/etc/gone +++ b/BitKeeper/etc/gone @@ -54,5 +54,6 @@ kergoth@direwolf.ppp.ti.com|tmp/base/tslib-1.0-r0/tslib/.patches/configure.patch kergoth@direwolf|tmp/base/make-3.80-r0/make-3.80/s.conftest|20031121052259|39582|c6bf26cbc42ce43 linux-c860-20040124.patch poodle/sharp_mmcsd_m.o +sharp-camera-2.4.18.tar.gz shepherd/sharp_mmcsd_m.o tosa/sharp_mmcsd_m.o diff --git a/sharp-binary-only/sharp-camera-support-2.4.18-rmk7-pxa3-embedix/sharp-camera-2.4.18.tar.gz b/sharp-binary-only/sharp-camera-support-2.4.18-rmk7-pxa3-embedix/CE-AG06.dat similarity index 100% rename from sharp-binary-only/sharp-camera-support-2.4.18-rmk7-pxa3-embedix/sharp-camera-2.4.18.tar.gz rename to sharp-binary-only/sharp-camera-support-2.4.18-rmk7-pxa3-embedix/CE-AG06.dat diff --git a/sharp-binary-only/sharp-camera-support-2.4.18-rmk7-pxa3-embedix/sharpzdc b/sharp-binary-only/sharp-camera-support-2.4.18-rmk7-pxa3-embedix/sharpzdc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sharp-binary-only/sharp-camera-support-2.4.18-rmk7-pxa3-embedix/sharpzdc.conf b/sharp-binary-only/sharp-camera-support-2.4.18-rmk7-pxa3-embedix/sharpzdc.conf new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.oe b/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.oe index efebef063c..05074d3f76 100644 --- a/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.oe +++ b/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.oe @@ -1,13 +1,25 @@ DESCRIPTION = "Driver for the SHARP CG-AG06 digital compact flash camera for linux ${PV}" -SECTION = "base" +SECTION = "kernel/modules" PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "CLOSED" +RDEPENDS = kernel (2.4.18-rmk7-pxa3-embedix)" +PR = "r1" -SRC_URI = "file://sharp-camera-2.4.18.tar.gz" -S = "${WORKDIR}/sharp-camera" +SRC_URI = "http://www.openzaurus.org/mirror/camera-modules-2.4.18-rmk7-pxa3-embedix.tar.bz2 \ + file://CE-AG06.dat \ + file://sharpzdc \ + file://sharpzdc.conf" +S = "${WORKDIR}" do_install() { - install -d ${D}/ - cp -a * ${D}/ + install -d ${D}/etc/pcmcia/cis + install -d ${D}/lib/modules/2.4.18-rmk7-pxa3-embedix/pcmcia + install -m 0644 ${WORKDIR}/CE-AG06.dat ${D}/etc/pcmcia/cis/ + install -m 0644 ${WORKDIR}/sharpzdc.conf ${D}/etc/pcmcia/ + install -m 0755 ${WORKDIR}/sharpzdc ${D}/etc/pcmcia/ + install -m 0644 sharpzdc_cs.o ${D}/lib/modules/2.4.18-rmk7-pxa3-embedix/pcmcia/ } FILES_${PN} = "/" + 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 e5fa5d887a..8cf9d2dde0 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 @@ -1,15 +1,15 @@ DESCRIPTION = "Driver for the SHARP Zaurus SD/MMC Slot for linux ${PV}" -SECTION = "base" +SECTION = "kernel/modules" PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "CLOSED" RDEPENDS = "kernel (2.4.18-rmk7-pxa3-embedix)" -PR = "r6" +PR = "r7" SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix.tar.bz2 \ file://sd \ file://sdmgr \ - file://sdcontrol \ - file://sharp_mmcsd_m.o" + file://sdcontrol" S = "${WORKDIR}" inherit update-rc.d