diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2014-07-24 16:38:36 +0300 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2014-07-24 16:38:36 +0300 |
| commit | 39f7e8e121e7a5ac6326faafe119f48c4ac7bb21 (patch) | |
| tree | f9f1cad2378dfc389d105e7d25c5332436af83d3 | |
| parent | f4588b3009ac43ba00022a59900226bc19059a55 (diff) | |
Fix package version mismatch
As reported in https://bugs.launchpad.net/linaro-ci/+bug/1300023,
kernel and package disagree in package version. This is because
we pass KERNELRELEASE only to deb-pkg, not to make Image and make
modules before it.
Change-Id: Ie4fc8e444d97c6e9ed8277190ce711dd82d96949
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
| -rwxr-xr-x | jenkins_common_lib | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jenkins_common_lib b/jenkins_common_lib index 4f2d457..0171e12 100755 --- a/jenkins_common_lib +++ b/jenkins_common_lib @@ -129,13 +129,13 @@ build_instructions() kernel_img_cmd=Image kernel_debarch=arm64 fi - eval 'make O=${pkg_dir} -j${j_count} ${kernel_img_cmd}'${redirect_output} + eval 'make KERNELRELEASE=${kernel_release} O=${pkg_dir} -j${j_count} ${kernel_img_cmd}'${redirect_output} if grep -Fxq 'CONFIG_MODULES=y' ${WORKSPACE}/${pkg_dir}/.config; then - eval 'make O=${pkg_dir} -j${j_count} modules'${redirect_output} + eval 'make KERNELRELEASE=${kernel_release} O=${pkg_dir} -j${j_count} modules'${redirect_output} fi if [ "$MAKE_DTBS" = "true" ]; then echo "Building with DTBS support..." - eval 'make O=${pkg_dir} dtbs'${redirect_output} + eval 'make KERNELRELEASE=${kernel_release} O=${pkg_dir} dtbs'${redirect_output} fi if [ "${make_bootwrapper}" = "true" -a "${ARCH}" = "arm64" ]; then echo "Building boot wrapper" |