Merge bk://openembedded@openembedded.bkbits.net/packages

into mhcln01.hentges.local:/home/mhentges/OpenEmbedded/packages

2004/10/11 18:35:17+02:00 local!CoreDump
The mother of all section fixes! Gives a SECTION entry to (almost) all packages which were missing it (and thus were having a section of *base*). I have placed all packages unknown to me into the *unknown* section (and yes, i *am* to lazy to look them up), please fix.

BKrev: 416ab6716BWMm_ae6D2MValq-LDFzw

38 files changed, 581 insertions, 7 deletions

diff --git a/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.oe
index e69de29bb2..302840b96e 100644
--- a/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -0,0 +1,10 @@
+SECTION = "kernel"
+COLLIE_MEMORY_SIZE=24
+COLLIE_RAMDISK_SIZE=8
+
+include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+
+do_deploy_append() {
+	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
+	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${DATETIME} ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
+}
diff --git a/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.oe
index e69de29bb2..4a40da0468 100644
--- a/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -0,0 +1,10 @@
+SECTION = "kernel"
+COLLIE_MEMORY_SIZE=32
+COLLIE_RAMDISK_SIZE=0
+
+include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+
+do_deploy_append() {
+	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
+	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${DATETIME} ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
+}
diff --git a/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.oe
index e69de29bb2..96bcc4be52 100644
--- a/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -0,0 +1,10 @@
+SECTION = "kernel"
+COLLIE_MEMORY_SIZE=32
+COLLIE_RAMDISK_SIZE=32
+
+include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+
+do_deploy_append() {
+	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
+	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${DATETIME} ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
+}
diff --git a/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.oe
index e69de29bb2..ada7a4dccc 100644
--- a/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -0,0 +1,10 @@
+SECTION = "kernel"
+COLLIE_MEMORY_SIZE=40
+COLLIE_RAMDISK_SIZE=24
+
+include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+
+do_deploy_append() {
+	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
+	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${DATETIME} ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
+}
diff --git a/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.oe
index e69de29bb2..e4186485e2 100644
--- a/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -0,0 +1,10 @@
+SECTION = "kernel"
+COLLIE_MEMORY_SIZE=48
+COLLIE_RAMDISK_SIZE=16
+
+include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+
+do_deploy_append() {
+	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
+	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${DATETIME} ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
+}
diff --git a/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.oe
index e69de29bb2..e84f7f003c 100644
--- a/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -0,0 +1,10 @@
+SECTION = "kernel"
+COLLIE_MEMORY_SIZE=58
+COLLIE_RAMDISK_SIZE=6
+
+include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+
+do_deploy_append() {
+	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
+	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${DATETIME} ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
+}
diff --git a/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.oe
index e69de29bb2..e562d9482e 100644
--- a/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -0,0 +1,10 @@
+SECTION = "kernel"
+COLLIE_MEMORY_SIZE=64
+COLLIE_RAMDISK_SIZE=0
+
+include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+
+do_deploy_append() {
+	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
+	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${DATETIME} ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
+}
diff --git a/linux/gumstix_2.6.5-gnalm1-gum0.oe b/linux/gumstix_2.6.5-gnalm1-gum0.oe
index 4ba8e73184..4beb7aef94 100644
--- a/linux/gumstix_2.6.5-gnalm1-gum0.oe
+++ b/linux/gumstix_2.6.5-gnalm1-gum0.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "Linux kernel for OMAP processors"
 LICENSE = "GPL"
 
diff --git a/linux/handhelds-pxa-2.6_2.6.6-hh0.oe b/linux/handhelds-pxa-2.6_2.6.6-hh0.oe
index e69de29bb2..09a1edbc1d 100644
--- a/linux/handhelds-pxa-2.6_2.6.6-hh0.oe
+++ b/linux/handhelds-pxa-2.6_2.6.6-hh0.oe
@@ -0,0 +1,29 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+LICENSE = "GPL"
+#
+PACKAGE_ARCH = "ipaqpxa"
+KERNEL_CCSUFFIX = "-3.3.4"
+COMPATIBLE_HOST = "arm.*-linux"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
+
+SRC_URI = "http://handhelds.org/~michaelo/ipaq/kernel/linux-2.6.6-hh0.tar.bz2  \
+           file://defconfig-${MACHINE}"
+
+S = "${WORKDIR}/linux-2.6.6-hh0"
+
+inherit kernel
+
+K_MAJOR = "2"
+K_MINOR = "6"
+K_MICRO = "6"
+HHV     = "0"
+#
+
+KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + int(oe.data.getVar('K_MINOR',d,1)) * 1000000 + int(oe.data.getVar('K_MICRO',d,1)) * 10000 + float(oe.data.getVar('HHV',d,1)))}"
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+        (echo N; echo m; echo N) | oe_runmake oldconfig
+}
diff --git a/linux/handhelds-pxa-2.6_2.6.8.1-hh0.oe b/linux/handhelds-pxa-2.6_2.6.8.1-hh0.oe
index e69de29bb2..d228912b6e 100644
--- a/linux/handhelds-pxa-2.6_2.6.8.1-hh0.oe
+++ b/linux/handhelds-pxa-2.6_2.6.8.1-hh0.oe
@@ -0,0 +1,30 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+LICENSE = "GPL"
+#
+PACKAGE_ARCH = "ipaqpxa"
+KERNEL_CCSUFFIX = "-3.3.4"
+COMPATIBLE_HOST = "arm.*-linux"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
+DEFCONFIG = "defconfig-${MACHINE}_2.6.8.1-hh0"
+
+SRC_URI = "http://handhelds.org/~michaelo/ipaq/kernel/linux-2.6.8.1-hh0_aug23_2004.tar.bz2  \
+           file://${DEFCONFIG}"
+
+S = "${WORKDIR}/linux-2.6.8.1-hh0"
+
+inherit kernel
+
+K_MAJOR = "2"
+K_MINOR = "6"
+K_MICRO = "8"
+HHV     = "0"
+#
+
+KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + int(oe.data.getVar('K_MINOR',d,1)) * 1000000 + int(oe.data.getVar('K_MICRO',d,1)) * 10000 + float(oe.data.getVar('HHV',d,1)))}"
+do_configure() {
+	install -m 0644 ${WORKDIR}/${DEFCONFIG} ${S}/.config || die "No default configuration for ${MACHINE} available."
+        (echo N; echo m; echo N) | oe_runmake oldconfig
+}
diff --git a/linux/handhelds-pxa-2.6_cvs.oe b/linux/handhelds-pxa-2.6_cvs.oe
index 4e3abaf5b5..46105f051d 100644
--- a/linux/handhelds-pxa-2.6_cvs.oe
+++ b/linux/handhelds-pxa-2.6_cvs.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
index b57489afb3..905ba4a49e 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe
index e69de29bb2..50c4d88cb0 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe
@@ -0,0 +1,57 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+LICENSE = "GPL"
+PR = "r0"
+
+PACKAGE_ARCH = "ipaqpxa"
+KERNEL_CCSUFFIX = "-3.3.3"
+COMPATIBLE_HOST = "arm.*-linux"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+	   file://defconfig-ipaqpxa \
+	   file://ipaq-hal.init \
+	   file://linux-2.4-no-short-loads.patch;patch=1 \
+	   file://linux-2.4-cpufreq.patch;patch=1 \
+	   file://ipsec.patch;patch=1"
+
+S = "${WORKDIR}/kernel"
+
+inherit kernel update-rc.d
+
+K_MAJOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
+K_MINOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
+K_MICRO = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
+RMKV    = "${@oe.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
+PXAV    = "${@oe.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
+HHV     = "${@oe.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
+
+KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + int(oe.data.getVar('K_MINOR',d,1)) * 1000000 + int(oe.data.getVar('K_MICRO',d,1)) * 10000 + int(oe.data.getVar('RMKV',d,1)) * 1000 + int(oe.data.getVar('PXAV',d,1)) * 100 + float(oe.data.getVar('HHV',d,1)))}"
+
+module_conf_h3900_asic = "alias ipaq_hal_3900 h3900_asic"
+module_conf_h5400_asic = "alias ipaq_hal_5400 h5400_asic"
+module_conf_pxa_ir = "alias irda0 pxa_ir"
+module_conf_i2c_algo_pxa = "options i2c-algo-pxa pxa_scan=0"
+module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
+module_conf_ppp_async = "alias ppp0 ppp_async"
+module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
+module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
+
+module_autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
+module_autoload_ds = "ds"
+module_autoload_pxa_cs = "pxa_cs"
+module_autoload_h3600_ts = "h3600_ts"
+module_autoload_apm = "apm"
+
+FILES_kernel += "/etc/init.d/ipaq-hal"
+INITSCRIPT_NAME = "ipaq-hal"
+INITSCRIPT_PARAMS = "start 21 S ."
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config
+}
+
+do_install_append() {
+	install -d ${D}/etc/init.d
+	install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+}
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
index d370709869..58755e4452 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.oe
index e69de29bb2..d72a7ddc1c 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.oe
@@ -0,0 +1,63 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+LICENSE = "GPL"
+PR = "r0"
+
+PACKAGE_ARCH = "ipaqpxa"
+KERNEL_CCSUFFIX = "-3.3.3"
+COMPATIBLE_HOST = "arm.*-linux"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+	   file://defconfig-ipaqpxa \
+	   file://ipaq-hal.init \
+	   file://linux-2.4-no-short-loads.patch;patch=1 \
+	   file://linux-2.4-cpufreq.patch;patch=1"
+
+S = "${WORKDIR}/kernel"
+
+inherit kernel update-rc.d
+
+K_MAJOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
+K_MINOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
+K_MICRO = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
+RMKV    = "${@oe.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
+PXAV    = "${@oe.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
+HHV     = "${@oe.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
+
+KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + int(oe.data.getVar('K_MINOR',d,1)) * 1000000 + int(oe.data.getVar('K_MICRO',d,1)) * 10000 + int(oe.data.getVar('RMKV',d,1)) * 1000 + int(oe.data.getVar('PXAV',d,1)) * 100 + float(oe.data.getVar('HHV',d,1)))}"
+
+module_conf_h3900_asic = "alias ipaq_hal_3900 h3900_asic"
+module_conf_h5400_asic = "alias ipaq_hal_5400 h5400_asic"
+module_conf_pxa_ir = "alias irda0 pxa_ir"
+module_conf_i2c_algo_pxa = "options i2c-algo-pxa pxa_scan=0"
+module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
+module_conf_ppp_async = "alias ppp0 ppp_async"
+module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
+module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
+
+module_autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
+module_autoload_h3600_ts = "h3600_ts"
+module_autoload_apm = "apm"
+module_autoload_af_packet = "af_packet"
+module_autoload_usb-ohci-h5400 = "usb-ohci-h5400"
+module_autoload_ppp_async = "ppp_async"
+module_autoload_usb-eth = "usb-eth"
+module_autoload_h5400_buzzer = "h5400_buzzer"
+module_autoload_mmc_h5400 = "mmc_h5400"
+
+FILES_kernel += "/etc/init.d/ipaq-hal"
+INITSCRIPT_NAME = "ipaq-hal"
+INITSCRIPT_PARAMS = "start 21 S ."
+
+# extra depends
+RDEPENDS_kernel-module-h5400-audio = "kernel-module-ak4535 kernel-module-i2c-adap-pxa"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config
+}
+
+do_install_append() {
+	install -d ${D}/etc/init.d
+	install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+}
diff --git a/linux/handhelds-sa-2.6_cvs.oe b/linux/handhelds-sa-2.6_cvs.oe
index e69de29bb2..f0f13a8a96 100644
--- a/linux/handhelds-sa-2.6_cvs.oe
+++ b/linux/handhelds-sa-2.6_cvs.oe
@@ -0,0 +1,24 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
+MAINTAINER = "Alex Lange <chicken@handhelds.org>"
+LICENSE = "GPL"
+#
+PACKAGE_ARCH_jornada56x = "jornada56x"
+PACKAGE_ARCH_ipaqsa = "ipaqsa"
+KERNEL_CCSUFFIX = "-3.3.4"
+COMPATIBLE_HOST = "arm.*-linux"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel26  \
+           file://defconfig-${MACHINE}"
+
+S = "${WORKDIR}/kernel26"
+
+inherit kernel
+#
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+        (echo N; echo m; echo N) | oe_runmake oldconfig
+}
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
index 3d414bc0b6..429211f75d 100644
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
 MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
 LICENSE = "GPL"
@@ -54,4 +55,3 @@ do_install_append() {
         install -d ${D}/etc/init.d
         install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
 }
-
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.oe
index e69de29bb2..c7e1e35e6f 100644
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.oe
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.oe
@@ -0,0 +1,57 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+LICENSE = "GPL"
+PR = "r0"
+
+PACKAGE_ARCH = "ipaqsa"
+KERNEL_CCSUFFIX = "-3.3.3"
+COMPATIBLE_HOST = "arm.*-linux"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig-ipaqsa \
+	   file://ipaq-hal.init"
+
+S = "${WORKDIR}/kernel"
+
+inherit kernel update-rc.d
+
+K_MAJOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
+K_MINOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
+K_MICRO = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
+RMKV    = "${@oe.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
+PXAV    = "${@oe.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
+HHV     = "${@oe.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
+
+KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + int(oe.data.getVar('K_MINOR',d,1)) * 1000000 + int(oe.data.getVar('K_MICRO',d,1)) * 10000 + int(oe.data.getVar('RMKV',d,1)) * 1000 + int(oe.data.getVar('PXAV',d,1)) * 100 + float(oe.data.getVar('HHV',d,1)))}"
+
+module_conf_h3600_micro = "alias ipaq_hal_3600 h3600_micro"
+module_conf_h3600_asic = "alias ipaq_hal_3800 h3600_asic"
+module_conf_sa1100_ir = "alias irda0 sa1100_ir"
+module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
+module_conf_ppp_async = "alias ppp0 ppp_async"
+module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
+module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
+module_conf_spectrum_cs = "options spectrum_cs ignore_cis_vcc=1"
+
+module_autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
+module_autoload_h3600_ts = "h3600_ts"
+module_autoload_apm = "apm"
+module_autoload_h3600-uda1341 = "h3600-uda1341"
+module_autoload_af_packet = "af_packet"
+module_autoload_ppp_async = "ppp_async"
+module_autoload_usb-eth = "usb-eth"
+
+FILES_kernel += "/etc/init.d/ipaq-hal"
+INITSCRIPT_NAME = "ipaq-hal"
+INITSCRIPT_PARAMS = "start 21 S ."
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config
+}
+
+do_install_append() {
+        install -d ${D}/etc/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+}
diff --git a/linux/ipod_2.4.24-ipod0.oe b/linux/ipod_2.4.24-ipod0.oe
index 3aeb656d2c..f66039f90e 100644
--- a/linux/ipod_2.4.24-ipod0.oe
+++ b/linux/ipod_2.4.24-ipod0.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "Linux kernel for Ipods"
 LICENSE = "GPL"
 KV = "2.4.24"
@@ -20,4 +21,3 @@ do_compile() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake
 }
-
diff --git a/linux/linux-bast_2.4.25-vrs1-bast1.oe b/linux/linux-bast_2.4.25-vrs1-bast1.oe
index b7aaf451ec..18197fa4bc 100644
--- a/linux/linux-bast_2.4.25-vrs1-bast1.oe
+++ b/linux/linux-bast_2.4.25-vrs1-bast1.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "Linux kernel for Simtec EB2410ITX"
 LICENSE = "GPL"
 KV = "2.4.25"
diff --git a/linux/linux-epia_2.6.8.1.oe b/linux/linux-epia_2.6.8.1.oe
index 8bbbf40f1c..929064306d 100644
--- a/linux/linux-epia_2.6.8.1.oe
+++ b/linux/linux-epia_2.6.8.1.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "Linux kernel for VIA EPiA"
 LICENSE = "GPL"
 PR = "r9"
diff --git a/linux/linux-mtx-1_2.4.24.oe b/linux/linux-mtx-1_2.4.24.oe
index 96de77bb88..612635c105 100644
--- a/linux/linux-mtx-1_2.4.24.oe
+++ b/linux/linux-mtx-1_2.4.24.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
@@ -40,4 +41,4 @@ do_deploy() {
 
 do_deploy[dirs] = "${S}"
 
-addtask deploy before do_build after do_compile
\ No newline at end of file
+addtask deploy before do_build after do_compile
diff --git a/linux/linux-omap-2.6_2.6.5-omap1.oe b/linux/linux-omap-2.6_2.6.5-omap1.oe
index e69de29bb2..40471ec935 100644
--- a/linux/linux-omap-2.6_2.6.5-omap1.oe
+++ b/linux/linux-omap-2.6_2.6.5-omap1.oe
@@ -0,0 +1,24 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for OMAP processors"
+LICENSE = "GPL"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.5-omap1.bz2;patch=1 \
+           file://defconfig"
+S = "${WORKDIR}/linux-2.6.5"
+
+inherit kernel
+
+KERNEL_IMAGETYPE = "zImage"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
+        oe_runmake oldconfig
+}
+
+python __anonymous () {
+	import re
+	host = oe.data.getVar('HOST_SYS', d, 1)
+	if not re.match('arm.*-linux', host):
+		raise oe.parse.SkipPackage("incompatible with host %s" % host)
+}
diff --git a/linux/linux-sun4cdm_2.4.26.oe b/linux/linux-sun4cdm_2.4.26.oe
index e69de29bb2..5075523179 100644
--- a/linux/linux-sun4cdm_2.4.26.oe
+++ b/linux/linux-sun4cdm_2.4.26.oe
@@ -0,0 +1,32 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for sparc32/sun4c"
+LICENSE = "GPL"
+PR = "r0"
+DEPENDS += "elftoaout-native"
+
+KERNEL_CCSUFFIX = "-3.3.4"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
+           file://defconfig"
+S = "${WORKDIR}/linux-${PV}"
+
+COMPATIBLE_HOST = 'sparc-linux'
+
+inherit kernel
+
+ARCH = "sparc"
+KERNEL_IMAGETYPE = "vmlinux"
+KERNEL_OUTPUT = "vmlinux"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+}
+
+do_deploy() {
+	install -d ${DEPLOY_DIR}/images
+	elftoaout -o ${DEPLOY_DIR}/images/linux-aout-${DATETIME} ${KERNEL_IMAGETYPE}
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
diff --git a/linux/linux-sun4cdm_2.6.8.1.oe b/linux/linux-sun4cdm_2.6.8.1.oe
index e69de29bb2..c8c40ed7f1 100644
--- a/linux/linux-sun4cdm_2.6.8.1.oe
+++ b/linux/linux-sun4cdm_2.6.8.1.oe
@@ -0,0 +1,19 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for sparc32/sun4c"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+           file://sun4c_defconfig"
+S = "${WORKDIR}/linux-${PV}"
+
+COMPATIBLE_HOST = 'sparc-linux'
+
+inherit kernel
+
+ARCH = "sparc"
+KERNEL_IMAGETYPE = "image"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/sun4c_defconfig ${S}/.config
+}
diff --git a/linux/linux-xxs1500_2.4.21.oe b/linux/linux-xxs1500_2.4.21.oe
index e69de29bb2..b3330158e1 100644
--- a/linux/linux-xxs1500_2.4.21.oe
+++ b/linux/linux-xxs1500_2.4.21.oe
@@ -0,0 +1,36 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for mycable xxs1500"
+LICENSE = "GPL"
+KV = "2.4.21"
+PV = "${KV}"
+PACKAGE_ARCH = "xxs1500"
+
+SRC_URI = "http://mycable.de/xxs1500/cms/index.php?download=linux-2.4.21-20040514.1522.tgz \
+	file://Makefile \
+	file://defconfig-xxs1500 \
+	file://zboot-Makefile-flags.diff;patch=1;pnum=0"
+
+S = "${WORKDIR}/linux"
+
+inherit kernel
+
+ARCH = "mips"
+KERNEL_OUTPUT = "arch/mips/zboot/images/xxs1500.flash.srec"
+KERNEL_IMAGETYPE = "zImage.flash"
+KERNEL_IMAGEDEST = "tmp"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig-xxs1500 ${S}/.config
+	cp ${WORKDIR}/Makefile ${S}/arch/mips
+}
+
+FILES_kernel += " /tmp"
+
+do_deploy() {
+        install -d ${DEPLOY_DIR}/images
+        install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR}/images/${MACHINE}-${KV}-${KERNEL_IMAGETYPE}-${DATETIME}
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
diff --git a/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe b/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe
index 175384e9b3..d5d34a7ed7 100644
--- a/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe
+++ b/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 LICENSE = "GPL"
 KV = "2.4.21"
 RMKV = "2"
diff --git a/linux/mnci-ramses_2.4.21-rmk2-pxa1.oe b/linux/mnci-ramses_2.4.21-rmk2-pxa1.oe
index 198ba2dcca..d565e4eeec 100644
--- a/linux/mnci-ramses_2.4.21-rmk2-pxa1.oe
+++ b/linux/mnci-ramses_2.4.21-rmk2-pxa1.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "Linux kernel for MNCI device"
 MAINTAINER = "M&N Solutions <info@mn-solutions.de>"
 LICENSE = "GPL"
diff --git a/linux/montavista-sa_2.4.17-mvl21.oe b/linux/montavista-sa_2.4.17-mvl21.oe
index ae9841d289..8312355ab6 100644
--- a/linux/montavista-sa_2.4.17-mvl21.oe
+++ b/linux/montavista-sa_2.4.17-mvl21.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the MASTERIA PA-100 device."
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
@@ -27,7 +28,8 @@ SRC_URI = "http://www.vanille.de/temp/linux-${KV}_${MVLV}.tar.gz \
 S = "${WORKDIR}/linux-${KV}_${MVLV}"
 
 def beagle_multiline_ppp():
-	str = "alias char-major-108\tppp_generic\nalias /dev/ppp\tppp_generic"
+	str = "alias char-major-108	ppp_generic
+alias /dev/ppp	ppp_generic"
 	return str
 
 
diff --git a/linux/nslu2-linksys_2.4.22.oe b/linux/nslu2-linksys_2.4.22.oe
index 4d782f492d..e7685e7121 100644
--- a/linux/nslu2-linksys_2.4.22.oe
+++ b/linux/nslu2-linksys_2.4.22.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Linksys NSLU2 device"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
@@ -41,4 +42,3 @@ do_deploy() {
 do_deploy[dirs] = "${S}"
 
 addtask deploy before do_build after do_compile
-
diff --git a/linux/nslu2-openslug_2.6.7.oe b/linux/nslu2-openslug_2.6.7.oe
index e69de29bb2..7b2074b1bd 100644
--- a/linux/nslu2-openslug_2.6.7.oe
+++ b/linux/nslu2-openslug_2.6.7.oe
@@ -0,0 +1,36 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for the Linksys NSLU2 device"
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.7.tar.bz2 \
+	   file://arm-Makefile.patch;patch=1 \
+           file://defconfig"
+S = "${WORKDIR}/linux-2.6.7"
+
+COMPATIBLE_HOST = 'arm.*-linux'
+
+inherit kernel
+
+ARCH = "arm"
+KERNEL_IMAGETYPE = "zImage"
+CMDLINE_CONSOLE ?= "ttyS0,115200n8"
+CMDLINE_ROOT = "root=/dev/ram0 initrd=0x01000000,10M mem=32M@0x00000000"
+CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+	rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \
+	       ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR}/images
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}.bin-${DATETIME}
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
diff --git a/linux/nslu2-unslung-kernel-ext3flash_2.3r25.oe b/linux/nslu2-unslung-kernel-ext3flash_2.3r25.oe
index e69de29bb2..bf4cac3aad 100644
--- a/linux/nslu2-unslung-kernel-ext3flash_2.3r25.oe
+++ b/linux/nslu2-unslung-kernel-ext3flash_2.3r25.oe
@@ -0,0 +1,7 @@
+SECTION = "kernel"
+include nslu2-linksys_2.4.22.oe
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/nslu2-unslung-kernel-${PV}', '${FILE_DIRNAME}/nslu2-linksys-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+SRC_URI += " file://unslung-kernel-ext3flash.patch;patch=1"
+CMDLINE_ROOT = "root=/dev/slug initrd=0x01000000,10M mem=32M@0x00000000"
diff --git a/linux/nslu2-unslung-kernel-vfatdisk2_2.3r25.oe b/linux/nslu2-unslung-kernel-vfatdisk2_2.3r25.oe
index e69de29bb2..2b11c5b473 100644
--- a/linux/nslu2-unslung-kernel-vfatdisk2_2.3r25.oe
+++ b/linux/nslu2-unslung-kernel-vfatdisk2_2.3r25.oe
@@ -0,0 +1,7 @@
+SECTION = "kernel"
+include nslu2-linksys_2.4.22.oe
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/nslu2-unslung-kernel-${PV}', '${FILE_DIRNAME}/nslu2-linksys-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+SRC_URI += " file://unslung-kernel-vfatdisk2.patch;patch=1"
+CMDLINE_ROOT = "root=/dev/slug initrd=0x01000000,10M mem=32M@0x00000000"
diff --git a/linux/nslu2-unslung-kernel_2.3r25.oe b/linux/nslu2-unslung-kernel_2.3r25.oe
index e69de29bb2..2f591b9269 100644
--- a/linux/nslu2-unslung-kernel_2.3r25.oe
+++ b/linux/nslu2-unslung-kernel_2.3r25.oe
@@ -0,0 +1,7 @@
+SECTION = "kernel"
+include nslu2-linksys_2.4.22.oe
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/nslu2-unslung-kernel-${PV}', '${FILE_DIRNAME}/nslu2-linksys-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+SRC_URI += " file://unslung-kernel.patch;patch=1"
+CMDLINE_ROOT = "root=/dev/slug initrd=0x01000000,10M mem=32M@0x00000000"
diff --git a/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.oe b/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.oe
index e69de29bb2..b01f7731aa 100644
--- a/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.oe
+++ b/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.oe
@@ -0,0 +1,5 @@
+SECTION = "kernel"
+include opensimpad_${PV}.oe
+
+SIMPAD_MEM = "64"
+SIMPAD_RD = "0"
diff --git a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
index 45d8200a8e..dc33e69887 100644
--- a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
+++ b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 #DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices."
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
@@ -66,4 +67,3 @@ do_configure() {
 	echo "CONFIG_CMDLINE=\"${CMDLINE} mem=${mem}M\"" >> ${S}/.config
         oe_runmake oldconfig
 }
-
diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
index a51a418b4e..5d9df2bdf3 100644
--- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
+++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
@@ -1,3 +1,4 @@
+SECTION = "kernel"
 PV = "2.4.18-rmk7-pxa3-embedix"
 LICENSE = "GPL"
 KV = "2.4.18"
@@ -83,4 +84,3 @@ do_deploy() {
 do_deploy[dirs] = "${S}"
 
 addtask deploy before do_build after do_compile
-
diff --git a/linux/openzaurus_2.6.8.1-jl1.oe b/linux/openzaurus_2.6.8.1-jl1.oe
index e69de29bb2..bb844f1c92 100644
--- a/linux/openzaurus_2.6.8.1-jl1.oe
+++ b/linux/openzaurus_2.6.8.1-jl1.oe
@@ -0,0 +1,60 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel 2.6 for Zaurus devices."
+LICENSE = "GPL"
+KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
+           http://www.cs.wisc.edu/~lenz/zaurus/files/patch-${PV}.diff.gz;patch=1 \
+           http://www.cs.wisc.edu/~lenz/zaurus/files/${MACHINE}-config-${PV}"
+
+#           file://patch-2.6.5-rp1.diff;patch=1 \
+#           file://collie-config-${PV} \
+#           file://poodle-config-${PV} \
+#           file://husky-config-${PV}"
+
+S = "${WORKDIR}/linux-${KV}"
+
+inherit kernel
+
+#
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+FILES_kernel = ""
+ALLOW_EMPTY = 1 
+        
+EXTRA_OEMAKE = ""
+COMPATIBLE_HOST = "arm.*-linux"
+KERNEL_CCSUFFIX = "-3.3.3"
+
+#FIXME: Use configuration system
+export MEM = "32"
+export RD = "32"
+export CMDLINE = "noinitrd root=/dev/mtdblock2 rootfstype=jffs2 console=tty0 jffs2_orphand_inodes=delete"
+export CMDLINEpxa = "console=ttyS0,9600n8 9600n8 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 console=tty0 jffs2_orphand_inodes=delete"
+
+do_configure() {
+        install -m 0644 ${WORKDIR}/www.cs.wisc.edu/${MACHINE}-config-${PV} ${S}/.config || die "No default configuration for ${MACHINE} available."
+
+        if [ "${MACHINE}" == "collie" ]
+	then
+		mem=${MEM}
+		rd=${RD}
+		mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
+		rdsize=`echo "$rd * 1024" | bc`
+		total=`expr $mem + $rd`
+		addr=`echo "obase=16; ibase=16; C000000 + $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
+	else
+		echo "CONFIG_CMDLINE=\"$CMDLINEpxa\"" >> ${S}/.config
+	fi
+        oe_runmake oldconfig
+}