linux-yocto-custom: Update for newer kernel

Update the NAME version tweak example patch for the
newer kernel. This moves the example to the 4.2 stable
kernel and appends -custom to the VERSION string.

(From OE-Core rev: dc26472661bdc0ed4248d7ab462a296f3c86c421)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2015-09-28 10:12:57 -07:00 committed by Richard Purdie
parent df09a6f4e3
commit 34707c21a0
2 changed files with 19 additions and 17 deletions

View File

@ -43,9 +43,9 @@
#
# example configuration addition:
# SRC_URI += "file://smp.cfg"
# example patch addition (for kernel v3.4 only):
# SRC_URI += "file://0001-linux-version-tweak.patch
# example feature addition (for kernel v3.4 only):
# example patch addition (for kernel v4.x only):
# SRC_URI += "file://0001-linux-version-tweak.patch"
# example feature addition (for kernel v4.x only):
# SRC_URI += "file://feature.scc"
#
@ -56,15 +56,14 @@ require recipes-kernel/linux/linux-yocto.inc
# tree if you do not want to build from Linus' tree.
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine"
LINUX_VERSION ?= "3.4"
LINUX_VERSION_EXTENSION ?= "-custom"
LINUX_VERSION ?= "4.2"
LINUX_VERSION_EXTENSION_append = "-custom"
# Modify SRCREV to a different commit hash in a copy of this recipe to
# build a different release of the Linux kernel.
# tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
# tag: v4.2 64291f7db5bd8150a74ad2036f1037e6a0428df2
SRCREV_machine="64291f7db5bd8150a74ad2036f1037e6a0428df2"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
# Override COMPATIBLE_MACHINE to include your machine in a copy of this recipe

View File

@ -1,26 +1,29 @@
From 5a55943a6bbb10a79994a0b18071b2427dffb15f Mon Sep 17 00:00:00 2001
From fb2c401374d4efe89e8da795e21d96fac038639d Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Mon, 11 Jun 2012 15:31:42 -0400
Subject: [PATCH] linux: version tweak
Upstream-Status: Inapproriate [example code]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index a687963..f5b1ac3 100644
index c361593..099e8ff 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ VERSION = 3
PATCHLEVEL = 4
@@ -2,7 +2,7 @@ VERSION = 4
PATCHLEVEL = 2
SUBLEVEL = 0
EXTRAVERSION =
-NAME = Saber-toothed Squirrel
+NAME = Saber-toothed Squirrel-custom
-NAME = Hurr durr I'ma sheep
+NAME = Hurr durr I'ma customized sheep
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
--
1.7.5.4
2.1.4