diff options
| author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2015-07-06 13:48:27 +0200 |
|---|---|---|
| committer | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2015-07-06 13:49:58 +0200 |
| commit | 41f55ed2dd0841d430811415bcdb9de932ffddb3 (patch) | |
| tree | f4b928a2abc968ecec6fb7f54170d2dd128a8ebc | |
| parent | b87d680d27da8199f2fed818897b6451612b1373 (diff) | |
jenkins_common_lib: use -O when calling merge_config.sh
it's supported since Kernel 3.9, no need to manually copy the generated config
file anymore.
Change-Id: If5705bebc05e73567e0cf1619ea747d2f6c17604
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
| -rwxr-xr-x | jenkins_common_lib | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/jenkins_common_lib b/jenkins_common_lib index 0a9f7c0..5514d5c 100755 --- a/jenkins_common_lib +++ b/jenkins_common_lib @@ -78,11 +78,7 @@ create_config_using_config_fragments() { fi fi - scripts/kconfig/merge_config.sh $conf_filenames - for cname in `find . -name \.config ` - do - mv $cname $WORKSPACE/$pkg_dir/ - done + scripts/kconfig/merge_config.sh -O $WORKSPACE/$pkg_dir/ $conf_filenames } build_instructions() |