Merge lp:~milo/linaro-ci/bug1067838 into lp:linaro-ci

[Milo Casagrande]

The branch drops support for hardcoded 3.4 git branches, and adds support for a generic conf_filenames env variable to support multiple in-tree config fragments.

The config files have to be specified, in the CI job, with their path:
export conf_filenames='linaro/configs/a.conf linaro/configs/b.conf'

[lp:~milo/linaro-ci/bug1067838]

121. By Milo Casagrande on 2012-12-14

Removed quotes.

122. By Milo Casagrande on 2012-12-18

Fixed variable name, removed tabulation.

=== modified file 'jenkins_common_lib'
--- jenkins_common_lib	2012-10-22 07:35:34 +0000
+++ jenkins_common_lib	2012-12-18 10:51:21 +0000
@@ -60,22 +60,35 @@
     mkdir $pkg_dir
 }
 
+create_config_using_config_fragments() {
+    ARCH=arm scripts/kconfig/merge_config.sh $conf_filenames
+    for cname in `find . -name \.config `
+    do
+         mv $cname $WORKSPACE/$pkg_dir/
+    done
+}
 
 build_instructions()
 {
     # Calling the function build setup to create build env
     build_setup
     START=$(date +%s)
-    make ARCH=arm clean mrproper
-    make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" $kernel_config
-
-    # Enabling the THUMB2 kernel option as the THUMB kernel does not seem to work
-    # well with THUMB2 userspace. This fixes the reboot issue(bug: 860556) we have seen
-    # for THUMB Kernel working with THUMB2 userspace.
-
-    echo "CONFIG_ARCH_OMAP2=n" >> $WORKSPACE/$pkg_dir/.config
-    echo "CONFIG_THUMB2_KERNEL=y" >> $WORKSPACE/$pkg_dir/.config
-    yes "" | make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" oldconfig	
+    if test $use_config_fragment -eq 1 ; then
+        create_config_using_config_fragments
+        echo "CONFIG_MODULES=y" >> $WORKSPACE/$pkg_dir/.config
+        make ARCH=arm clean mrproper
+    else
+        make ARCH=arm clean mrproper
+        make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" $kernel_config
+
+        # Enabling the THUMB2 kernel option as the THUMB kernel does not seem to work
+        # well with THUMB2 userspace. This fixes the reboot issue(bug: 860556) we have seen
+        # for THUMB Kernel working with THUMB2 userspace.
+
+        echo "CONFIG_ARCH_OMAP2=n" >> $WORKSPACE/$pkg_dir/.config
+        echo "CONFIG_THUMB2_KERNEL=y" >> $WORKSPACE/$pkg_dir/.config
+    fi
+    yes "" | make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" oldconfig
     make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" -j$j_count uImage
     make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" -j$j_count modules
     if [ "$MAKE_DTBS" = "true" ]; then

=== modified file 'jenkins_kernel_build_inst'
--- jenkins_kernel_build_inst	2012-12-12 08:52:14 +0000
+++ jenkins_kernel_build_inst	2012-12-18 10:51:21 +0000
@@ -46,6 +46,13 @@
   git_reset=false
 fi
 
+if test -z "$conf_filenames"; then
+  conf_filenames='omap4.conf'
+fi
+if test -z "$use_config_fragment"; then
+  use_config_fragment=0
+fi
+
 export kernel_config
 export hwpack_type
 export board_type
@@ -54,6 +61,8 @@
 export git_web_url
 export submit_job
 export lava_test_plan
+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'`
 export TOOLCHAIN_PREFIX=`echo $gcc_compiler | sed -e 's/-gcc$/-/'`