[oe-commits] Andrea Adami : linux-kexecboot: fix SRC_URI and unhide logo_linux_clut224. ppm

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: e12fb470292d0fbe6b6912c779033c2c1cf8aa3e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e12fb470292d0fbe6b6912c779033c2c1cf8aa3e

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Sat May 29 23:58:44 2010 +0200

linux-kexecboot: fix SRC_URI and unhide logo_linux_clut224.ppm

---

 recipes/kexecboot/linux-kexecboot_2.6.21-hh20.bb |    4 +---
 recipes/kexecboot/linux-kexecboot_2.6.24.bb      |    2 +-
 recipes/kexecboot/linux-kexecboot_2.6.26.bb      |    2 +-
 recipes/kexecboot/linux-kexecboot_git.bb         |    2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/recipes/kexecboot/linux-kexecboot_2.6.21-hh20.bb b/recipes/kexecboot/linux-kexecboot_2.6.21-hh20.bb
index 619f771..83a9fd1 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.21-hh20.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.21-hh20.bb
@@ -6,14 +6,12 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_hx4700 = "1"
 DEFAULT_PREFERENCE_h2200 = "1"
 
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI += "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch \
            http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;name=rppatch35 \
            file://gcc4x-limits.patch \
 	   file://defconfig"
 
-SRC_URI += "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2"
-
 S = "${WORKDIR}/kernel26"
 
 
diff --git a/recipes/kexecboot/linux-kexecboot_2.6.24.bb b/recipes/kexecboot/linux-kexecboot_2.6.24.bb
index 55f0b7d..731796a 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.24.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.24.bb
@@ -23,7 +23,7 @@ DEFAULT_PREFERENCE_spitz = "1"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
+SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
 	   file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch \
            ${RPSRC}/export_atags-r2.patch;status=pending;name=rppatch54 \
            ${RPSRC}/lzo_crypto-r2.patch;status=pending;name=rppatch36 \
diff --git a/recipes/kexecboot/linux-kexecboot_2.6.26.bb b/recipes/kexecboot/linux-kexecboot_2.6.26.bb
index cdc3f56..f8e87c4 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.26.bb
@@ -22,7 +22,7 @@ DEFAULT_PREFERENCE_akita = "1"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2;name=kernel \
+SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2;name=kernel \
            ${RPSRC}/lzo_jffs2_sysfs-r1.patch;name=rppatch1 \
            ${RPSRC}/hx2750_base-r34.patch;name=rppatch2 \
            ${RPSRC}/hx2750_bl-r9.patch;name=rppatch3 \
diff --git a/recipes/kexecboot/linux-kexecboot_git.bb b/recipes/kexecboot/linux-kexecboot_git.bb
index 0f8a425..7afd2bc 100644
--- a/recipes/kexecboot/linux-kexecboot_git.bb
+++ b/recipes/kexecboot/linux-kexecboot_git.bb
@@ -4,7 +4,7 @@ KERNEL_RELEASE = "2.6.34"
 SRCREV = "e40152ee1e1c7a63f4777791863215e3faa37a86"
 PV = "${KERNEL_RELEASE}+gitr${SRCPV}"
 
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \
+SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \
            file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
            file://defconfig"