diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-02-16 04:32:38 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-02 22:45:27 +0000 |
commit | 1f821673130c8e7ab61780c0fc092241dbe02c71 (patch) | |
tree | d7dfd9021ae3bc348d9d2d70b71de6b14533a493 /meta/recipes-kernel | |
parent | 08385ae5b236b5d82fc51243adfc357c405d0d54 (diff) | |
download | poky-1f821673130c8e7ab61780c0fc092241dbe02c71.tar.gz |
kern-tools: import configuration, controls and audit updates
Updating the kern-tools SRCREV to import the following fixes:
commit 7f91d198d32fc90260e52724ef4aac0b997c1e8b
kconf_check: fix new Kconfig detection
One of the functions of the kernel configuration audit is to notify
the user if Kconfig* files have been removed from the kernel, and
also to notify of new Kconfig files.
New Kconfig files should be classified as hardware or non-hardware to
allow BSP audits to notify if boards are setting values that they
shouldn't, hence why notifying about new "buckets" is important.
commit c4f26a3296e0e1c3dbdd5ec8e2947d5443a9ffc2
updateme/scc: allow config fragment exclusion
It is common to need the features (patches, git operations) of a
branch, but not want the kernel configuration fragments of a given
branch. To allow this, we provide a new include flag "nocfg".
When this flag is used, all of the configuration fragments included
by the targetted feature will not be applied to the current build,
with one exception, a base/critical fragment can force it's config
values, since without them, the system would not be functional.
Example:
include ktypes/standard/standard.scc nocfg
commit c7ec19d55aca6c4b17073c5362fce5be61a89d82
scc: wrap git merge
To allow for parameter validation and sanity checking, wrap "git merge"
as a dedicated "merge" command instead of using the raw git fallback.
This also makes it consistent with existing top level commands such
as 'tag', 'branch', 'patch', etc.
There are no changes to arguments, and existing 'git merge' commands
continue to work with this change.
[YOCTO #3419]
[YOCTO #3421]
(From OE-Core rev: faf042b2c87874153a6b689479ab86e49804af8c)
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/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 |
1 files changed, 1 insertions, 1 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 98cd8b9e85..9f4438c119 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | |||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c | |||
4 | 4 | ||
5 | DEPENDS = "git-native guilt-native" | 5 | DEPENDS = "git-native guilt-native" |
6 | 6 | ||
7 | SRCREV = "9284af9b968d40e441b10f5c09961cbe329ccb9b" | 7 | SRCREV = "7f91d198d32fc90260e52724ef4aac0b997c1e8b" |
8 | PR = "r12" | 8 | PR = "r12" |
9 | PV = "0.1+git${SRCPV}" | 9 | PV = "0.1+git${SRCPV}" |
10 | 10 | ||