[oe-commits] org.oe.dev merge of '3fa699bc0a61f0428ee89c547a1c840aeaa076c3'

[rwhitby commit]

merge of '3fa699bc0a61f0428ee89c547a1c840aeaa076c3'
     and '7d09f4b4eadc0654db7add3b9a29d77f0350e9a9'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 7655eff5deff6116be1866bf0bdda4479e900b0c
ViewMTN: http://monotone.openembedded.org/revision/info/7655eff5deff6116be1866bf0bdda4479e900b0c
Files:
1
packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
Diffs:

#
# mt diff -r3fa699bc0a61f0428ee89c547a1c840aeaa076c3 -r7655eff5deff6116be1866bf0bdda4479e900b0c
#
# 
# 
# patch "packages/linux/unslung-kernel_2.4.22.l2.3r63.bb"
#  from [3cf3e65980ff2941b1b15dd46f53d088a8f88462]
#    to [b5e796a22c471b4d8a343f091cd2a3b7e4dc99f5]
# 
============================================================
--- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb	3cf3e65980ff2941b1b15dd46f53d088a8f88462
+++ packages/linux/unslung-kernel_2.4.22.l2.3r63.bb	b5e796a22c471b4d8a343f091cd2a3b7e4dc99f5
@@ -1,7 +1,7 @@ LICENSE = "GPL"
 SECTION = "kernel"
 DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device"
 LICENSE = "GPL"
-PR = "r20"
+PR = "r21"
 
 COMPATIBLE_HOST = 'arm.*-linux'
 COMPATIBLE_MACHINE = "nslu2"
@@ -38,7 +38,7 @@ ARCH = "arm"
 inherit kernel
 
 ARCH = "arm"
-KERNEL_SUFFIX = "ixp4xxbe"
+KERNEL_SUFFIX = "nslu2be"
 CMDLINE_CONSOLE ?= "ttyS0,115200"
 CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M at 0x00000000"
 CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}"
@@ -52,7 +52,7 @@ do_deploy() {
 
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}.bin
 }
 
 do_deploy[dirs] = "${S}"


#
# mt diff -r7d09f4b4eadc0654db7add3b9a29d77f0350e9a9 -r7655eff5deff6116be1866bf0bdda4479e900b0c
#
# 
# no changes
#