nslu2-linksys-kernel: subsumed into unslung-kernel

12 files changed, 53 insertions, 67 deletions

diff --git a/packages/linux/nslu2-linksys-kernel-2.4.22/nslu2/.mtn2git_empty b/packages/linux/nslu2-linksys-kernel-2.4.22/nslu2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/linux/nslu2-linksys-kernel-2.4.22/nslu2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/linux/nslu2-linksys-kernel_2.4.22.bb b/packages/linux/nslu2-linksys-kernel_2.4.22.bb
deleted file mode 100644
index 7132d411fb..0000000000
--- a/packages/linux/nslu2-linksys-kernel_2.4.22.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Linux kernel for the Linksys NSLU2 device"
-LICENSE = "GPL"
-PR = "r2"
-
-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://defconfig"
-S = "${WORKDIR}/linux-2.4.22"
-
-COMPATIBLE_HOST = 'arm.*-linux'
-COMPATIBLE_MACHINE = "nslu2"
-
-inherit kernel
-
-ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_SUFFIX ?= "nslu2-linksys"
-CMDLINE_CONSOLE ?= "ttyS0,115200"
-CMDLINE_ROOT = "root=/dev/ram0 initrd=0x01000000,10M mem=32M@0x00000000"
-CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}"
-
-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_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
diff --git a/packages/linux/nslu2-linksys-kernel-2.4.22/config-fixes.patch b/packages/linux/unslung-kernel/config-fixes.patch
index 2afbe66f0a..2afbe66f0a 100644
--- a/packages/linux/nslu2-linksys-kernel-2.4.22/config-fixes.patch
+++ b/packages/linux/unslung-kernel/config-fixes.patch
diff --git a/packages/linux/nslu2-linksys-kernel-2.4.22/double_cpdo.patch b/packages/linux/unslung-kernel/double_cpdo.patch
index 4069358db8..4069358db8 100644
--- a/packages/linux/nslu2-linksys-kernel-2.4.22/double_cpdo.patch
+++ b/packages/linux/unslung-kernel/double_cpdo.patch
diff --git a/packages/linux/nslu2-linksys-kernel-2.4.22/gcc-registerparanoia.patch b/packages/linux/unslung-kernel/gcc-registerparanoia.patch
index 7c3e538e1e..7c3e538e1e 100644
--- a/packages/linux/nslu2-linksys-kernel-2.4.22/gcc-registerparanoia.patch
+++ b/packages/linux/unslung-kernel/gcc-registerparanoia.patch
diff --git a/packages/linux/nslu2-linksys-kernel-2.4.22/gcc3-userfuncs.patch b/packages/linux/unslung-kernel/gcc3-userfuncs.patch
index 54726bf740..54726bf740 100644
--- a/packages/linux/nslu2-linksys-kernel-2.4.22/gcc3-userfuncs.patch
+++ b/packages/linux/unslung-kernel/gcc3-userfuncs.patch
diff --git a/packages/linux/nslu2-linksys-kernel-2.4.22/linux-2.4.24-attribute-used.patch b/packages/linux/unslung-kernel/linux-2.4.24-attribute-used.patch
index bcf1c10335..bcf1c10335 100644
--- a/packages/linux/nslu2-linksys-kernel-2.4.22/linux-2.4.24-attribute-used.patch
+++ b/packages/linux/unslung-kernel/linux-2.4.24-attribute-used.patch
diff --git a/packages/linux/nslu2-linksys-kernel-2.4.22/nofpu.patch b/packages/linux/unslung-kernel/nofpu.patch
index c23eceb506..c23eceb506 100644
--- a/packages/linux/nslu2-linksys-kernel-2.4.22/nofpu.patch
+++ b/packages/linux/unslung-kernel/nofpu.patch
diff --git a/packages/linux/nslu2-linksys-kernel-2.4.22/.mtn2git_empty b/packages/linux/unslung-kernel/nslu2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/nslu2-linksys-kernel-2.4.22/.mtn2git_empty
+++ b/packages/linux/unslung-kernel/nslu2/.mtn2git_empty
diff --git a/packages/linux/nslu2-linksys-kernel-2.4.22/nslu2/defconfig b/packages/linux/unslung-kernel/nslu2/defconfig
index 5ed64cbff5..5ed64cbff5 100644
--- a/packages/linux/nslu2-linksys-kernel-2.4.22/nslu2/defconfig
+++ b/packages/linux/unslung-kernel/nslu2/defconfig
diff --git a/packages/linux/nslu2-linksys-kernel-2.4.22/short_loadbytes.patch b/packages/linux/unslung-kernel/short_loadbytes.patch
index f0b514225c..f0b514225c 100644
--- a/packages/linux/nslu2-linksys-kernel-2.4.22/short_loadbytes.patch
+++ b/packages/linux/unslung-kernel/short_loadbytes.patch
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 6a22591795..531f389898 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,30 +1,61 @@
 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"
 
-KERNEL_SUFFIX = "unslung"
+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@0x00000000"
+CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}"
+
+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_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+}
+
+do_deploy[dirs] = "${S}"
 
-UNSLUNG_KERNEL_EXTRA_SRC_URI ?=
-
-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}"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+addtask deploy before do_build after do_compile