[oe-commits] org.oe.dev nslu2-linksys-kernel: subsumed into unslung-kernel

[rwhitby commit]

nslu2-linksys-kernel: subsumed into unslung-kernel

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 2eb5baaedeaaf62c3a9344b45d784ee5fcab9386
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2eb5baaedeaaf62c3a9344b45d784ee5fcab9386
Files:
1
packages/linux/nslu2-linksys-kernel-2.4.22
packages/linux/nslu2-linksys-kernel_2.4.22.bb
packages/linux/nslu2-linksys-kernel-2.4.22/config-fixes.patch
packages/linux/unslung-kernel/config-fixes.patch
packages/linux/nslu2-linksys-kernel-2.4.22/double_cpdo.patch
packages/linux/unslung-kernel/double_cpdo.patch
packages/linux/nslu2-linksys-kernel-2.4.22/gcc-registerparanoia.patch
packages/linux/unslung-kernel/gcc-registerparanoia.patch
packages/linux/nslu2-linksys-kernel-2.4.22/gcc3-userfuncs.patch
packages/linux/unslung-kernel/gcc3-userfuncs.patch
packages/linux/nslu2-linksys-kernel-2.4.22/linux-2.4.24-attribute-used.patch
packages/linux/unslung-kernel/linux-2.4.24-attribute-used.patch
packages/linux/nslu2-linksys-kernel-2.4.22/nofpu.patch
packages/linux/unslung-kernel/nofpu.patch
packages/linux/nslu2-linksys-kernel-2.4.22/nslu2
packages/linux/unslung-kernel/nslu2
packages/linux/nslu2-linksys-kernel-2.4.22/short_loadbytes.patch
packages/linux/unslung-kernel/short_loadbytes.patch
packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
Diffs:

#
# mt diff -rb65424e33070a37b9fcbf66fde2b5824eae05cfb -r2eb5baaedeaaf62c3a9344b45d784ee5fcab9386
#
# 
# 
# delete "packages/linux/nslu2-linksys-kernel-2.4.22"
# 
# delete "packages/linux/nslu2-linksys-kernel_2.4.22.bb"
# 
# rename "packages/linux/nslu2-linksys-kernel-2.4.22/config-fixes.patch"
#     to "packages/linux/unslung-kernel/config-fixes.patch"
# 
# rename "packages/linux/nslu2-linksys-kernel-2.4.22/double_cpdo.patch"
#     to "packages/linux/unslung-kernel/double_cpdo.patch"
# 
# rename "packages/linux/nslu2-linksys-kernel-2.4.22/gcc-registerparanoia.patch"
#     to "packages/linux/unslung-kernel/gcc-registerparanoia.patch"
# 
# rename "packages/linux/nslu2-linksys-kernel-2.4.22/gcc3-userfuncs.patch"
#     to "packages/linux/unslung-kernel/gcc3-userfuncs.patch"
# 
# rename "packages/linux/nslu2-linksys-kernel-2.4.22/linux-2.4.24-attribute-used.patch"
#     to "packages/linux/unslung-kernel/linux-2.4.24-attribute-used.patch"
# 
# rename "packages/linux/nslu2-linksys-kernel-2.4.22/nofpu.patch"
#     to "packages/linux/unslung-kernel/nofpu.patch"
# 
# rename "packages/linux/nslu2-linksys-kernel-2.4.22/nslu2"
#     to "packages/linux/unslung-kernel/nslu2"
# 
# rename "packages/linux/nslu2-linksys-kernel-2.4.22/short_loadbytes.patch"
#     to "packages/linux/unslung-kernel/short_loadbytes.patch"
# 
# patch "packages/linux/unslung-kernel_2.4.22.l2.3r63.bb"
#  from [333a24ae41772de0971bfb5bf25f9f9d780f57df]
#    to [b96398b403be656e05d9b24a0decccd597e277a6]
# 
============================================================
--- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb	333a24ae41772de0971bfb5bf25f9f9d780f57df
+++ packages/linux/unslung-kernel_2.4.22.l2.3r63.bb	b96398b403be656e05d9b24a0decccd597e277a6
@@ -1,30 +1,61 @@ SECTION = "kernel"
 SECTION = "kernel"
+DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device"
+LICENSE = "GPL"
+PR = "r17"
+
+COMPATIBLE_HOST = 'arm.*-linux'
 COMPATIBLE_MACHINE = "nslu2"
 
-require nslu2-linksys-kernel_2.4.22.bb
+UNSLUNG_KERNEL_EXTRA_SRC_URI ?= ""
 
-DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
-PR = "r17"
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2 \
+	   http://nslu.sf.net/downloads/xfs-2.4.22-all-i386.bz2;patch=1 \
+	   http://nslu.sf.net/downloads/2.4.22-xfs-nslu2.patch.bz2;patch=1 \
+	   file://config-fixes.patch;patch=1 \
+	   file://nofpu.patch;patch=1 \
+	   file://short_loadbytes.patch;patch=1 \
+	   file://gcc3-userfuncs.patch;patch=1 \
+	   file://gcc-registerparanoia.patch;patch=1 \
+	   file://linux-2.4.24-attribute-used.patch;patch=1 \
+	   file://double_cpdo.patch;patch=1 \
+	   file://linux-kernel-R25_to_R29.patch;patch=1 \
+	   file://linux-kernel-R29_to_R63.patch;patch=1 \
+	   file://flash-is-now-hdd.patch;patch=1 \
+	   file://gl811e.patch;patch=1 \
+	   file://usbnet.patch;patch=1 \
+	   file://missing-usb-ioctls.patch;patch=1 \
+	   file://anonymiser.patch;patch=1 \
+	   file://ppp_mppe.patch;patch=1 \
+	   file://nfs-blocksize.patch;patch=1 \
+	   file://pl2303.patch;patch=1 \
+	   file://pl2303_mdmctl.patch;patch=1 \
+	   file://netconsole.patch;patch=1 \
+	   file://ppp_mppe_no_fp_in_kernel.patch;patch=1 \
+           file://defconfig \
+	   ${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
+S = "${WORKDIR}/linux-2.4.22"
 
+inherit kernel
+
+ARCH = "arm"
+KERNEL_IMAGETYPE = "zImage"
 KERNEL_SUFFIX = "unslung"
-
+CMDLINE_CONSOLE ?= "ttyS0,115200"
 CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M at 0x00000000"
+CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}"
 
-UNSLUNG_KERNEL_EXTRA_SRC_URI ?=
+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
+}
 
-SRC_URI += "file://linux-kernel-R25_to_R29.patch;patch=1 \
-	    file://linux-kernel-R29_to_R63.patch;patch=1 \
-	    file://flash-is-now-hdd.patch;patch=1 \
-	    file://gl811e.patch;patch=1 \
-	    file://usbnet.patch;patch=1 \
-	    file://missing-usb-ioctls.patch;patch=1 \
-	    file://anonymiser.patch;patch=1 \
-	    file://ppp_mppe.patch;patch=1 \
-	    file://nfs-blocksize.patch;patch=1 \
-	    file://pl2303.patch;patch=1 \
-	    file://pl2303_mdmctl.patch;patch=1 \
-	    file://netconsole.patch;patch=1 \
-	    file://ppp_mppe_no_fp_in_kernel.patch;patch=1 \
-	    ${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+}
 
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"