From eb6a1aa09125e45350fa3a096af23e5050447e50 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 17 Nov 2010 14:48:23 -0800 Subject: [PATCH] linux-efikamx: Fix the existing 2.6.31 recipe to use lower case letter in package name * Use upstream Amit's branch for git recipe Signed-off-by: Khem Raj --- .../linux/linux-efikamx-2.6.31/remove-localversion.patch | 7 +++++++ recipes/linux/linux-efikamx_2.6.31.bb | 2 ++ ..._git+2.6.31.14.bb => linux-efikamx_git+2.6.36-rc7.bb} | 9 ++++----- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 recipes/linux/linux-efikamx-2.6.31/remove-localversion.patch rename recipes/linux/{linux-efikamx_git+2.6.31.14.bb => linux-efikamx_git+2.6.36-rc7.bb} (51%) diff --git a/recipes/linux/linux-efikamx-2.6.31/remove-localversion.patch b/recipes/linux/linux-efikamx-2.6.31/remove-localversion.patch new file mode 100644 index 0000000000..857fe0c065 --- /dev/null +++ b/recipes/linux/linux-efikamx-2.6.31/remove-localversion.patch @@ -0,0 +1,7 @@ +Index: linux-efikamx-2.6.31/localversion +=================================================================== +--- linux-efikamx-2.6.31.orig/localversion ++++ linux-efikamx-2.6.31/localversion +@@ -1 +1 @@ +--ER1 ++-er1 diff --git a/recipes/linux/linux-efikamx_2.6.31.bb b/recipes/linux/linux-efikamx_2.6.31.bb index 96eb682dfc..e01e6c2949 100644 --- a/recipes/linux/linux-efikamx_2.6.31.bb +++ b/recipes/linux/linux-efikamx_2.6.31.bb @@ -23,6 +23,7 @@ efikamx_kernel_do_unpack () { mkdir -p ${S} tar xf ${DL_DIR}/${PN}-${PV}.tar.lzma --strip-components=1 -C ${S} tar xf ${DL_DIR}/patch-${PV}.tar.lzma -C ${S} + (cd ${S}/patches; ln -s ${FILESPATHBASE}/${PN}-${PV}/remove-localversion.patch .) } python do_patch () { @@ -36,6 +37,7 @@ efikamx_kernel_do_patch (){ SRC_URI += "http://www.powerdeveloper.org/asset/by-id/73;name=kernel \ http://www.powerdeveloper.org/asset/by-id/83;name=patch \ + file://remove-localversion.patch;apply=no \ " SRC_URI[kernel.md5sum] = "c70ce0549cf85de79d5b28db7b552868" diff --git a/recipes/linux/linux-efikamx_git+2.6.31.14.bb b/recipes/linux/linux-efikamx_git+2.6.36-rc7.bb similarity index 51% rename from recipes/linux/linux-efikamx_git+2.6.31.14.bb rename to recipes/linux/linux-efikamx_git+2.6.36-rc7.bb index 470a8b5c7a..11e920196b 100644 --- a/recipes/linux/linux-efikamx_git+2.6.31.14.bb +++ b/recipes/linux/linux-efikamx_git+2.6.36-rc7.bb @@ -1,15 +1,14 @@ require linux.inc -FILESPATHPKG =. "linux-efikamx-git/${MACHINE}:" - DEFAULT_PREFERENCE = "-1" +FILESPATHPKG =. "linux-efikamx-git/${MACHINE}:" -SRCREV = "21ec3b1b1ab24c1cba6cb932b3572fb19d10e701" -PV = "2.6.31.14" +SRCREV = "85d9835be629110084a518f3c02ce852929fbff7" +PV = "2.6.36-rc7" PR = "r0" -SRC_URI = "git://gitorious.org/efikamx/linux-kernel.git;protocol=git \ +SRC_URI = "git://git.linaro.org/people/amitk/linux-2.6.git;branch=wip-efikamx-cleanup3;protocol=git \ file://defconfig" COMPATIBLE_MACHINE = "(efikamx)" -- 2.39.5