diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2013-08-17 13:40:21 +0300 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2013-08-17 13:40:21 +0300 |
| commit | 254e98dce9dcafa2fea4c8e46fe3e770ee903ed5 (patch) | |
| tree | eb42e33943c03a3b7590efb7b33d0ea340a947ff /jenkins_common_lib | |
| parent | 89e6c6864d9870ed842aeeb0613bd2fb1b7ac690 (diff) | |
Revert r161 - kernel CI experiments
Diffstat (limited to 'jenkins_common_lib')
| -rwxr-xr-x | jenkins_common_lib | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/jenkins_common_lib b/jenkins_common_lib index 00d5309..80f015b 100755 --- a/jenkins_common_lib +++ b/jenkins_common_lib @@ -21,7 +21,7 @@ echo HWPACK_TYPE=$hwpack_type >> hwpack_info echo ROOTFS_TYPE=$rootfs_type >> hwpack_info echo BUNDLE_STREAM_NAME=$bundle_stream_name_path >> hwpack_info echo JOB_URL=http://snapshots.linaro.org/kernel-hwpack/ >> hwpack_info -echo KERNEL_VERSION=${kernel_version} >> hwpack_info +echo KERNEL_VERSION=`make kernelversion` >> hwpack_info echo KERNEL_GIT=$KERNEL_GIT >> hwpack_info echo KERNEL_COMMIT=$KERNEL_COMMIT >> hwpack_info echo COMMIT_TIME=`git show -s --format=%cD HEAD` >> hwpack_info @@ -101,35 +101,31 @@ build_instructions() START=$(date +%s) cpu_count=`getconf _NPROCESSORS_ONLN` j_count=`expr $cpu_count '*' 2` - kernel_build_options="ARCH=arm O=${pkg_dir} KERNELVERSION=${kernel_version} KERNELRELEASE=${kernel_version} CROSS_COMPILE=${TOOLCHAIN_PREFIX}" - redirect_output=" &>${pkg_dir}.log" if [ -n "$conf_filenames" -o -n "$conf_git" ] ; then create_config_using_config_fragments - eval 'make ARCH=arm clean mrproper'${redirect_output} + make ARCH=arm clean mrproper elif [ -n "$kernel_config" ]; then - eval 'make ARCH=arm clean mrproper'${redirect_output} - eval 'make ${kernel_build_options} $kernel_config'${redirect_output} + make ARCH=arm clean mrproper + make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" $kernel_config else echo "Kernel configuration isn't set (kernel_config or conf_filenames or conf_git)" exit 1 fi - yes "" | eval 'make ${kernel_build_options} oldconfig'${redirect_output} + yes "" | make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" oldconfig if grep -Fxq 'CONFIG_ARCH_MULTIPLATFORM=y' ${WORKSPACE}/${pkg_dir}/.config; then kernel_img_cmd=zImage else kernel_img_cmd=uImage fi - eval 'make ${kernel_build_options} -j$j_count ${kernel_img_cmd}'${redirect_output} + make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" -j$j_count ${kernel_img_cmd} if grep -Fxq 'CONFIG_MODULES=y' ${WORKSPACE}/${pkg_dir}/.config; then - eval 'make ${kernel_build_options} -j$j_count modules'${redirect_output} + make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" -j$j_count modules fi if [ "$MAKE_DTBS" = "true" ]; then echo "Building with DTBS support..." - eval 'make ${kernel_build_options} dtbs'${redirect_output} - fi - if [ "${make_deb}" = "true" ]; then - eval 'make ${kernel_build_options} KBUILD_DEBARCH=armhf V=1 deb-pkg'${redirect_output} + make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" dtbs fi + make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" KBUILD_DEBARCH=armhf V=1 deb-pkg END=$(date +%s) EXECUTION_TIME_IN_SEC=$(( $END - $START )) |