summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-11-15 16:05:39 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-02 15:20:27 +0000
commit19b4f42db4cc55c9c6e1fe994c2de13e6f132d34 (patch)
treee020b1b701b4996f56ba1d3de6da0220c3b7d709
parent1752107cb1add575a7f73b095ca83690983d5d21 (diff)
downloadpoky-19b4f42db4cc55c9c6e1fe994c2de13e6f132d34.tar.gz
poky-19b4f42db4cc55c9c6e1fe994c2de13e6f132d34.tar.bz2
poky-19b4f42db4cc55c9c6e1fe994c2de13e6f132d34.zip
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. (From OE-Core rev: 78efb73e0bca09c09574ce23622859db412a26c8) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb5
1 files changed, 3 insertions, 2 deletions
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() {
: