Merge lp:~fboudra/linaro-ci/check-modules-are-enabled into lp:linaro-ci

Proposed by Fathi Boudra
Status: Merged
Approved by: Fathi Boudra
Approved revision: 139
Merged at revision: 139
Proposed branch: lp:~fboudra/linaro-ci/check-modules-are-enabled
Merge into: lp:linaro-ci
Diff against target: 14 lines (+3/-1)
1 file modified
jenkins_common_lib (+3/-1)
To merge this branch: bzr merge lp:~fboudra/linaro-ci/check-modules-are-enabled
Reviewer Review Type Date Requested Status
Fathi Boudra Approve
Review via email: mp+157541@code.launchpad.net

Description of the change

Check modules are enabled in the kernel configuration before calling make modules command.

To post a comment you must log in.
Revision history for this message
Fathi Boudra (fboudra) wrote :

< Gwaihir> fabo, anyway, good to go without me approving that one :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jenkins_common_lib'
2--- jenkins_common_lib 2013-03-27 23:55:19 +0000
3+++ jenkins_common_lib 2013-04-07 11:22:23 +0000
4@@ -119,7 +119,9 @@
5 kernel_img_cmd=uImage
6 fi
7 make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" -j$j_count ${kernel_img_cmd}
8- make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" -j$j_count modules
9+ if grep -Fxq 'CONFIG_MODULES=y' ${WORKSPACE}/${pkg_dir}/.config; then
10+ make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" -j$j_count modules
11+ fi
12 if [ "$MAKE_DTBS" = "true" ]; then
13 echo "Building with DTBS support..."
14 make ARCH=arm O=$pkg_dir KERNELVERSION="$kernel_version" KERNELRELEASE="$kernel_version" CROSS_COMPILE="$TOOLCHAIN_PREFIX" dtbs

Subscribers

People subscribed via source and target branches