Patchwork [CONSOLIDATED,PULL,11/18] kern-tools: add pre_config and merge_config.sh to the list of tools

login
register
mail settings
Submitter Saul Wold
Date Dec. 2, 2011, 6:55 a.m.
Message ID <a6945fe6fa8a6c1ad5ceec5c05b8eb29a29c4d18.1322808632.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/16051/
State Accepted
Commit 78efb73e0bca09c09574ce23622859db412a26c8
Headers show

Comments

Saul Wold - Dec. 2, 2011, 6:55 a.m.
From: Bruce Ashfield <bruce.ashfield@windriver.com>

As a transition step to moving kern_tools into the kernel tree
itself this change adopts merge_config.sh as a common base for
merging configuration fragments. So we add merge_config.sh and
pre_config to the list of kern_tools.

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

Patch

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 87aa574..ef078ce 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
 DEPENDS = "git-native guilt-native"
 
 SRCREV = "364437739c45a5e771d1f7b3ac73c35f1328fd97"
-PR = r10
+PR = r11
 PV = "0.1+git${SRCPV}"
 
 inherit native
@@ -16,7 +16,8 @@  S = "${WORKDIR}"
 kern_tools_LIST = kgit kgit-init kgit-meta \
                   kgit-checkpoint kgit-clean \
                   generate_cfg kconf_check configme \
-		  createme updateme patchme get_defconfig scc
+		  createme updateme patchme get_defconfig scc \
+                  pre_config merge_config.sh
 
 do_compile() { 
 	: