From 19b4f42db4cc55c9c6e1fe994c2de13e6f132d34 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 15 Nov 2011 16:05:39 -0500 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-kernel') 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() { : -- cgit v1.2.3-54-g00ecf