merge of 2ba8efd35a14c2dca849205133efdd2ecd83c907

     and d43467c2202cf4bba65631e9cb48b580772f7fc1

5 files changed, 69 insertions, 1 deletions

diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 52f216438a..1a8dee7a4d 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -145,7 +145,6 @@ IXP4XX_PATCHES ?= ""
 
 SRC_URI  = "${IXP4XX_SRCURI}"
 SRC_URI += "${IXP4XX_PATCHES}"
-SRC_URI += "file://defconfig"
 
 COMPATIBLE_HOST = 'arm.*-linux'
 
diff --git a/packages/linux/ixp4xx-kernel_2.6.15.3.bb b/packages/linux/ixp4xx-kernel_2.6.15.3.bb
index d62147392c..f73b388baa 100644
--- a/packages/linux/ixp4xx-kernel_2.6.15.3.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.15.3.bb
@@ -12,6 +12,8 @@ PR = "r0.${PR_CONFIG}"
 
 include ixp4xx-kernel.inc
 
+SRC_URI += "file://defconfig"
+
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
 
 # IXP4XX_PATCHES - full list of patches to apply
diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb
index 0134add8f7..008c665cfb 100644
--- a/packages/linux/ixp4xx-kernel_2.6.16.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.16.bb
@@ -12,6 +12,8 @@ PR = "r7.${PR_CONFIG}"
 
 include ixp4xx-kernel.inc
 
+SRC_URI += "file://defconfig"
+
 # IXP4XX_PATCHES - full list of patches to apply
 IXP4XX_PATCHES  = ""
 
diff --git a/packages/linux/ixp4xx-kernel_2.6.17.bb b/packages/linux/ixp4xx-kernel_2.6.17.bb
new file mode 100644
index 0000000000..f7d0881013
--- /dev/null
+++ b/packages/linux/ixp4xx-kernel_2.6.17.bb
@@ -0,0 +1,33 @@
+# Kernel for IXP4xx
+#
+# Increment PR_CONFIG for changes to the ixp4xx-kernel specific
+# defconfig (do *NOT* increment anything in here for changes
+# to other kernel configs!)
+PR_CONFIG = "0"
+#
+# Increment the number below (i.e. the digits after PR) when
+# making changes within this file or for changes to the patches
+# applied to the kernel.
+PR = "r1.${PR_CONFIG}"
+
+include ixp4xx-kernel.inc
+
+SRC_URI += "http://svn.nslu2-linux.org/svnroot/kernel/trunk/patches/2.6.17/defconfig"
+
+# IXP4XX_PATCHES - full list of patches to apply
+IXP4XX_PATCHES  = ""
+
+SVN_SRC = "http://svn.nslu2-linux.org/svnroot/kernel/trunk/patches/2.6.17"
+
+# IXP4XX_PATCHES += "file://06-remove-extraversion.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/01-nas100d-leds.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/02-nas100d-mac-addr.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/03-nslu2-leds.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/04-nslu2-mac-addr.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/05-timer-ixp4xx.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/06-timer-nslu2.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/07-copypage-xscale.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/15-jffs2-endian-config.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/20-nas100d-cmdline-fixup.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/20-nslu2-cmdline-fixup.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/50-leds-arm-cpu-activity.patch;patch=1"
diff --git a/packages/linux/xanadux-un-2.6_2.6.12.bb b/packages/linux/xanadux-un-2.6_2.6.12.bb
new file mode 100644
index 0000000000..1f5527400e
--- /dev/null
+++ b/packages/linux/xanadux-un-2.6_2.6.12.bb
@@ -0,0 +1,32 @@
+############## /home/jrs/cvs/oe/org.openembedded.dev/packages/linux/xanadux-un-2.6_2.6.12.bb ###############
+
+DESCRIPTION = "Xanadux HTC-Universal kernel based on the hh 2.6.12"
+MAINTAINER = "goxboxlive <goxboxlive@gmail.com>"
+LICENSE = "GPL"
+PR="r2"
+
+SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=pserver;module=linux-2.6-xda;tag=K2-6-12-hh2-xda0-un0"
+S = "${WORKDIR}/linux-2.6-xda"
+
+COMPATIBLE_HOST = "arm.*-linux"
+
+inherit kernel
+
+do_configure() {
+        cp arch/arm/configs/htcuniversal_defconfig .config || die "No default configuration for ${MACHINE} available."
+        yes '' | oe_runmake oldconfig
+}
+
+
+###############################################################
+# put into deploy directory
+#
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_package after do_install