Patchwork [3/4] linux-yocto: explicitly export KMETA to scripts

login
register
mail settings
Submitter Bruce Ashfield
Date Aug. 15, 2012, 8:06 p.m.
Message ID <9078a41253493093a432343648aa8fa9b4efd70a.1345059176.git.bruce.ashfield@windriver.com>
Download mbox | patch
Permalink /patch/34671/
State Accepted
Commit 9b90c8ace04c88ac6105f0bf686f9abc70fe8074
Headers show

Comments

Bruce Ashfield - Aug. 15, 2012, 8:06 p.m.
The kern-tools scripts can support a meta branch and directory of a name that
isn't "meta", but they need the name passed through the environment variable
KMETA. ensuring that KMETA is exported in the shell environment sets the stage
to support flexible meta branch name.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass                  |    5 ++++-
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 10a8d40..1b37dc7 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -45,6 +45,7 @@  def find_urls(d):
 
 do_patch() {
 	cd ${S}
+	export KMETA=${KMETA}
 
 	# if kernel tools are available in-tree, they are preferred
 	# and are placed on the path before any external tools. Unless
@@ -62,7 +63,7 @@  do_patch() {
 	if [ -n "${KMETA}" ]; then
 		createme_flags="--disable-meta-gen"
 	fi
-	createme ${createme_flags} ${ARCH} ${kbranch}
+	createme ${createme_flags} --meta ${KMETA} ${ARCH} ${kbranch}
 	if [ $? -ne 0 ]; then
 		echo "ERROR. Could not create ${kbranch}"
 		exit 1
@@ -180,6 +181,7 @@  addtask kernel_checkout before do_patch after do_unpack
 do_kernel_configme[dirs] = "${S} ${B}"
 do_kernel_configme() {
 	echo "[INFO] doing kernel configme"
+	export KMETA=${KMETA}
 
 	if [ -n ${KCONFIG_MODE} ]; then
 		configmeflags=${KCONFIG_MODE}
@@ -220,6 +222,7 @@  python do_kernel_configcheck() {
 # are corrected to the proper commit.
 do_validate_branches() {
 	cd ${S}
+	export KMETA=${KMETA}
 
 	set +e
 	# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 0cb111c..c176aed 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@  LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "12c39b76eca4ed993b5ffb38cbe89e0608b216c3"
+SRCREV = "579b1ba2169d053c1330854f54f605bb6929d6d8"
 PR = "r12"
 PV = "0.1+git${SRCPV}"