From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Tue, 15 Nov 2011 21:05:39 +0000 (-0500)
Subject: kern-tools: add pre_config and merge_config.sh to the list of tools
X-Git-Tag: 2015-4~12531
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=78efb73e0bca09c09574ce23622859db412a26c8;p=openembedded-core.git

kern-tools: add pre_config and merge_config.sh to the list of tools

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>
---

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 87aa5748d5..ef078cef2a 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() { 
 	: