compile openzaurus kernels and modules using the OZ version appended to EXTRAVERSION

BKrev: 41b708d5vT6S2lzR9WJNcF9rNvjN7g

4 files changed, 156 insertions, 2 deletions

diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb
index afed2cbd08..f3054b9752 100644
--- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb
+++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb
@@ -5,7 +5,7 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20031107"
-PR = "r25"
+PR = "r26"
 DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices."
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
@@ -79,7 +79,7 @@ CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
 #
 FILES_kernel = ""
 
-EXTRA_OEMAKE = ""
+EXTRA_OEMAKE = " EXTRAVERSION=-rmk7-pxa3-embedix-${DISTRO_VERSION}"
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index e69de29bb2..966c26aae8 100644
--- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -0,0 +1,95 @@
+SECTION = "kernel"
+PV = "2.4.18-rmk7-pxa3-embedix"
+LICENSE = "GPL"
+KV = "2.4.18"
+RMKV = "7"
+PXAV = "3"
+SHARPV = "20030509"
+PR = "r14"
+DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices."
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
+
+SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \
+           file://cacko.patch;patch=1 \
+           file://battery.patch;patch=1 \
+           file://bluetooth-2.4.18-mh15.patch;patch=1 \
+           file://iw_handlers.w13-5.diff;patch=1 \
+           file://iw_handlers.w14-5.diff;patch=1 \
+           file://iw240_we15-6.diff;patch=1 \
+           file://idecs.patch;patch=1 \
+           file://logo.patch;patch=1 \
+           file://initsh.patch;patch=1 \
+           file://keymap-more-sane.patch;patch=1 \
+           file://mkdep.patch;patch=1 \
+           file://disable-pcmcia-probe.patch;patch=1 \
+           file://linux-2.4.18-list_move.patch;patch=1 \
+	   http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \
+	   file://1764-1.patch;patch=1 \
+           file://module_licence.patch;patch=1 \
+	   http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we16-6.diff;patch=1 \
+           file://defconfig-${MACHINE} \
+	   "
+
+# that patch allow to use buzzer as sound device but it removes alarms,
+# touchclicks etc so it is removed until be fixed
+#           file://sound-2.4.18r2.patch;patch=1 
+
+# apply this when we have a patch that allows building with gcc 3.x:
+# SRC_URI_append = file://gcc-3.3.patch;patch=1
+# SRC_URI_append = file://machtune-args.patch;patch=1
+
+S = "${WORKDIR}/linux"
+
+inherit kernel
+
+#
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+FILES_kernel = ""
+ALLOW_EMPTY = 1
+
+KERNEL_CCSUFFIX = "-2.95"
+KERNEL_LDSUFFIX = "-2.11.2"
+COMPATIBLE_HOST = "arm.*-linux"
+EXTRA_OEMAKE = " EXTRAVERSION=-rmk7-pxa3-embedix-${DISTRO_VERSION}"
+
+module_conf_usbdmonitor = "alias usbd0 usbdmonitor"
+module_conf_sa1100_bi = "below sa1100_bi net_fd usbdcore "
+module_autoload_sa1100_bi = "sa1100_bi"
+module_autoload_collie_ssp = "collie_ssp"
+module_autoload_collie_tc35143af = "collie_tc35143af"
+#
+# FIXME: Use configuration system
+#
+export mem = ${@bb.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"}
+export rd  = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"}
+export CMDLINE = "${CMDLINE_CONSOLE} root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphaned_inodes=delete"
+
+do_configure_prepend() {
+        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+
+        mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
+        rdsize=`echo "$rd * 1024" | bc`
+        total=`expr $mem + $rd`
+        addr=`echo "obase=16; ibase=16; C0000000 + $mempos" | bc`
+        if [ "$rd" == "0" ]
+        then
+                echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
+        else
+                echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
+                echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize"     >> ${S}/.config
+                echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
+                echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
+        fi
+        echo "CONFIG_CMDLINE=\"$CMDLINE mem=${mem}M\"" >> ${S}/.config
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR}/images
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
+
diff --git a/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb b/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
index e69de29bb2..69d0f7cab3 100644
--- a/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Driver for the SHARP CG-AG06 digital compact flash camera for linux ${PV}"
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "CLOSED"
+RDEPENDS = "kernel (${KERNEL_VERSION})"
+PR = "r4"
+
+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}"
+
+inherit module-base
+
+do_install() {
+	install -d ${D}/etc/pcmcia/cis
+	install -d ${D}/lib/modules/${KERNEL_VERSION}/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 ${MACHINE}/sharpzdc_cs.o ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
+}
+
+FILES_${PN} = "/"
+
+PACKAGE_ARCH := "${MACHINE_ARCH}"
diff --git a/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
index e69de29bb2..a09eaa0731 100644
--- a/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -0,0 +1,31 @@
+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 = "r8"
+
+SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix.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}/etc/init.d ${D}/sbin
+	install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/block/
+	install -m 0755 ${WORKDIR}/sdmgr ${D}/sbin/
+	install -m 0755 ${WORKDIR}/sdcontrol ${D}/${sysconfdir}
+	install -m 0755 ${WORKDIR}/sd ${D}/etc/init.d/
+	install -m 0644 ${MACHINE}/sharp_mmcsd_m.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/block/
+}
+
+FILES_${PN} = "/"
+
+PACKAGE_ARCH := "${MACHINE_ARCH}"