diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2013-02-05 14:36:40 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-13 16:52:31 +0000 |
commit | 56dc1720caa48344238d352c7b6e9b0f0d41aa54 (patch) | |
tree | b735d5905ec1d6b594774f42ff6be7a37028d6f0 /meta | |
parent | a2339986d17a35ab5b69bedfa43bdb3283b8abab (diff) | |
download | poky-56dc1720caa48344238d352c7b6e9b0f0d41aa54.tar.gz |
busybox: add config fragments
Add config fragments to busybox.
The implementation makes use of merge_config.sh script in kern-tools-native.
The use case is similar to the yocto kernel's configuration fragments.
We also add kern-tools-native to busybox's DEPENDS variable to ensure
that merge_config.sh is available when required.
[YOCTO #3379]
(From OE-Core rev: bbcd8b344598850ea2c8d3ad375c519713581fde)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 972e7d09c6..fc6ca917cd 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -3,6 +3,8 @@ DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into | |||
3 | HOMEPAGE = "http://www.busybox.net" | 3 | HOMEPAGE = "http://www.busybox.net" |
4 | BUGTRACKER = "https://bugs.busybox.net/" | 4 | BUGTRACKER = "https://bugs.busybox.net/" |
5 | 5 | ||
6 | DEPENDS += "kern-tools-native" | ||
7 | |||
6 | # bzip2 applet in busybox is based on lightly-modified bzip2 source | 8 | # bzip2 applet in busybox is based on lightly-modified bzip2 source |
7 | # the GPL is version 2 only | 9 | # the GPL is version 2 only |
8 | LICENSE = "GPLv2 & bzip2" | 10 | LICENSE = "GPLv2 & bzip2" |
@@ -112,8 +114,19 @@ do_prepare_config () { | |||
112 | fi | 114 | fi |
113 | } | 115 | } |
114 | 116 | ||
117 | # returns all the elements from the src uri that are .cfg files | ||
118 | def find_cfgs(d): | ||
119 | sources=src_patches(d, True) | ||
120 | sources_list=[] | ||
121 | for s in sources: | ||
122 | if s.endswith('.cfg'): | ||
123 | sources_list.append(s) | ||
124 | |||
125 | return sources_list | ||
126 | |||
115 | do_configure () { | 127 | do_configure () { |
116 | do_prepare_config | 128 | do_prepare_config |
129 | merge_config.sh -m .config ${@" ".join(find_cfgs(d))} | ||
117 | cml1_do_configure | 130 | cml1_do_configure |
118 | } | 131 | } |
119 | 132 | ||