diff options
| author | Milo Casagrande <milo@ubuntu.com> | 2012-12-13 11:40:53 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo@ubuntu.com> | 2012-12-13 11:40:53 +0100 |
| commit | 1961364f931b12a52322a18b183c808640d5e26d (patch) | |
| tree | 98dd697e74db59c80ec4e8d3cb9d64a8d66a0295 | |
| parent | 2c170ce08c7084bd19979811c172d4415bbb9c83 (diff) | |
Use conf_filenames for multiple in-tree conf fragments.
| -rwxr-xr-x | jenkins_common_lib | 7 | ||||
| -rwxr-xr-x | jenkins_kernel_build_inst | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/jenkins_common_lib b/jenkins_common_lib index 7d8686b..9300397 100755 --- a/jenkins_common_lib +++ b/jenkins_common_lib @@ -61,12 +61,7 @@ build_setup() } create_config_using_config_fragments() { - mkdir -p linaro/configs/ - board_config_url="http://git.linaro.org/gitweb?p=kernel/configs.git;a=blob_plain;f=linaro/configs/$conf_filename;hb=refs/heads/config-boards-3.4" - curl $board_config_url > linaro/configs/$conf_filename - curl "http://git.linaro.org/gitweb?p=kernel/configs.git;a=blob_plain;f=linaro/configs/ubuntu-minimal.conf;hb=refs/heads/config-core-3.4" > linaro/configs/ubuntu-minimal.conf - curl "http://git.linaro.org/gitweb?p=kernel/configs.git;a=blob_plain;f=linaro/configs/linaro-base.conf;hb=refs/heads/config-core-3.4" > linaro/configs/linaro-base.conf - ARCH=arm scripts/kconfig/merge_config.sh linaro/configs/linaro-base.conf linaro/configs/ubuntu-minimal.conf linaro/configs/$conf_filename + ARCH=arm scripts/kconfig/merge_config.sh "$conf_filenames" for cname in `find . -name \.config ` do mv $cname $WORKSPACE/$pkg_dir/ diff --git a/jenkins_kernel_build_inst b/jenkins_kernel_build_inst index 515bcb9..efbf81c 100755 --- a/jenkins_kernel_build_inst +++ b/jenkins_kernel_build_inst @@ -46,7 +46,7 @@ if test -z "$git_reset"; then git_reset=false fi -if test -z "$conf_filename"; then +if test -z "$conf_filenames"; then conf_filename='omap4.conf' fi if test -z "$use_config_fragment"; then @@ -61,7 +61,7 @@ export rootfs_type export git_web_url export submit_job export lava_test_plan -export conf_filename +export conf_filenames export use_config_fragment export gcc_cc_version=`sh $PWD/scripts/gcc-version.sh -p $gcc_compiler` export bundle_stream_name=`echo $JOB_NAME | sed -e 's/_.*//' -e 's/\./_/g'` |