Merge oe-devel@oe-devel.bkbits.net:packages

into handhelds.org:/home/kergoth/code/packages.bb

2004/12/08 23:02:08+00:00 nexus.co.uk!pb
enable evdev module in simpad kernel

2004/12/08 14:31:54+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/12/08 14:31:25+00:00 nexus.co.uk!pb
also rename depmod to depmod.24

BKrev: 41b7a599Fr0y_o8WLpQ_JNq1AQhj-A

diff --git a/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/defconfig-simpad b/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/defconfig-simpad
index 537451c..90791c6 100644 (file)
--- a/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/defconfig-simpad
+++ b/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/defconfig-simpad
@@ -819,7 +819,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_KEYBDEV=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_MX1TS is not set
 

diff --git a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index e69de29..dc2250b 100644 (file)
--- a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -0,0 +1,70 @@
+DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices."
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+SECTION = "kernel"
+LICENSE = "GPL"
+KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
+VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
+PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
+JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
+PR = "r17"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/opensimpad-${PV}"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
+           file://${KV}-${VRSV}.patch;patch=1 \
+           file://${KV}-${VRSV}-${PXAV}.patch;patch=1 \
+           file://${KV}-${VRSV}-${PXAV}-${JPMV}.patch;patch=1 \
+           file://sound-volume-reversed.patch;patch=1 \
+          file://disable-pcmcia-probe.patch;patch=1 \
+           file://mkdep.patch;patch=1 \
+           file://defconfig-${MACHINE} \
+          http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \
+           file://mipv6-1.1-v2.4.25.patch;patch=1 \
+           file://simpad-backlight-if.diff;patch=1;pnum=0 \
+           file://simpad-switches-input.diff;patch=1;pnum=0 \
+           file://simpad-switches-input2.diff;patch=1;pnum=0 \
+          file://keymap.patch;patch=1 \
+           file://simpad-apm.diff;patch=1;pnum=0 \
+           file://simpad-ts-noninput.diff;patch=1;pnum=0 \
+           file://simpad-pm-updates.patch;patch=1;pnum=0"
+
+# 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-${KV}"
+
+inherit kernel
+
+KERNEL_CCSUFFIX = "-3.3.3"
+COMPATIBLE_HOST = "arm.*-linux"
+
+SIMPAD_MEM     = ${@bb.data.getVar("SIMPAD_MEMORY_SIZE",d,1)  or "32"}
+SIMPAD_RD      = ${@bb.data.getVar("SIMPAD_RAMDISK_SIZE",d,1) or "32"}
+export CMDLINE = ${@bb.data.getVar("SIMPAD_CMDLINE",d,1) or  "mtdparts=sa1100:512k(boot),1m(kernel),14848k(root),-(home) console=ttySA root=1f02 noinitrd jffs2_orphaned_inodes=delete rootfstype=jffs2 "}
+EXTRA_OEMAKE = ""
+
+module_conf_sa1100_ir = "alias irda0 sa1100_ir"
+
+do_configure() {
+        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+              
+       mem=${SIMPAD_MEM}
+       rd=${SIMPAD_RD}
+        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 is not set" >> ${S}/.config
+        else
+                echo "CONFIG_MTD_MTDRAM=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
+        oe_runmake oldconfig
+}

diff --git a/modutils/modutils_2.4.27.bb b/modutils/modutils_2.4.27.bb
index e69de29..17fbb2f 100644 (file)
--- a/modutils/modutils_2.4.27.bb
+++ b/modutils/modutils_2.4.27.bb
@@ -0,0 +1,87 @@
+SECTION = "base"
+DESCRIPTION = "These utilities are intended to make a Linux modular kernel \
+manageable for all users, administrators and distribution maintainers."
+LICENSE = "GPLv2"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files"
+PR = "r6"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
+           file://lex.l.diff;patch=1 \
+           file://modutils-notest.patch;patch=1 \
+           file://configure.patch;patch=1 \
+           file://program_prefix.patch;patch=1 \
+           file://armeb.patch;patch=1"
+
+inherit autotools
+
+# modutils go in /sbin
+sbindir = "/sbin"
+EXTRA_OECONF = "--disable-strip"
+export BUILDCC = "${BUILD_CC}"
+export BUILDCFLAGS = "${BUILD_CFLAGS}"
+
+do_install () {
+       oe_runmake 'DESTDIR=${D}' install
+       install -d ${D}/${sysconfdir}
+       rm ${D}/sbin/lsmod
+       install -d ${D}/bin/
+       ln -s ../sbin/insmod ${D}/bin/lsmod
+        for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do                mv ${D}/$f ${D}/$f.24
+        done
+}
+
+pkg_postinst_modutils () {
+#!/bin/sh
+for f in sbin/insmod sbin/modprobe sbin/rmmod bin/lsmod; do
+       bn=`basename $f`
+       update-alternatives --install /$f $bn /$f.24 10
+done
+if test -n "$D"; then
+       D="-r $D"
+       if test -n "`which ${TARGET_PREFIX}depmod`"; then
+               for kerneldir in `ls -p ${IMAGE_ROOTFS}/lib/modules|grep /`; do
+                       kernelver=`basename $kerneldir`
+                       ${TARGET_PREFIX}depmod -a -b ${IMAGE_ROOTFS} -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver
+               done
+       fi
+fi
+update-rc.d $D modutils.sh start 20 S .
+}
+
+pkg_prerm_modutils () {
+#!/bin/sh
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
+bn=`basename $f`
+       update-alternatives --remove $bn /$f.24
+done
+if test -n "$D"; then
+       D="-r $D"
+fi
+update-rc.d $D modutils.sh remove
+}
+
+pkg_postinst_modutils-depmod() {
+#!/bin/sh
+update-alternatives --install /sbin/depmod depmod /sbin/depmod.24 10
+}
+
+pkg_postinst_modutils-modinfo() { 
+#!/bin/sh
+update-alternatives --install /sbin/modinfo modinfo /sbin/modinfo.24 10
+}
+
+pkg_prerm_modutils-depmod() {
+#!/bin/sh
+update-alternatives --remove depmod /sbin/depmod.24
+}
+
+pkg_prerm_modutils-modinfo() {
+#!/bin/sh
+update-alternatives --remove modinfo /sbin/modinfo.24
+}
+
+PACKAGES = "modutils-depmod modutils-modinfo modutils-doc modutils"
+
+FILES_modutils-depmod = "sbin/depmod.24"
+FILES_modutils-modinfo = "sbin/modinfo.24"
+RDEPENDS_modutils = "modutils-depmod"