aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2015-03-20 11:55:16 +0200
committerFathi Boudra <fathi.boudra@linaro.org>2015-03-20 11:55:16 +0200
commita8208552d99f4f36f5b0ca03a60421a914f6e67d (patch)
tree9e44dac4bd42ccf9ff051af8bd9efc74b855bb89
parent5c8026f658697c45e288d096dcbf2cb3d39de135 (diff)
downloadubuntu-kernel-ci-a8208552d99f4f36f5b0ca03a60421a914f6e67d.tar.gz
package_kernel: fix kernel version
with 4.0.0-rc kernel, the logic doesn't work anymore. rely on Makefile values, use only kernel version and patch level. Note: we still lie on the kernel version when RCs are used. We can't use kernel sub level and extra version (ksl/kev) because it will break the meta package Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rwxr-xr-xscripts/package_kernel9
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/package_kernel b/scripts/package_kernel
index 259d47e..7bdf2fc 100755
--- a/scripts/package_kernel
+++ b/scripts/package_kernel
@@ -240,11 +240,12 @@ fixup_socflavour_contents()
fixup_kernel_version()
{
test "$auto_kernel_version" = "true" && {
- kv=$(make kernelversion)
- kv=${kv/.?-rc*/}
- kv=${kv/.0/}
+ kv=`head -n 1 Makefile |tail -n 1 | cut -d' ' -f3`
+ kpl=`head -n 2 Makefile |tail -n 1 | cut -d' ' -f3`
+ ksl=`head -n 3 Makefile |tail -n 1 | cut -d' ' -f3`
+ kev=`head -n 4 Makefile |tail -n 1 | cut -d' ' -f3 | tr -s "-" "~"`
sed -i \
- -e "1 s/.*/linux-linaro-SOCFLAVOUR-$kv ($kv.0-1.1ubuntu1) UNRELEASED; urgency=low/" \
+ -e "1 s/.*/linux-linaro-SOCFLAVOUR-${kv}.${kpl} (${kv}.${kpl}.0-1.1ubuntu1) UNRELEASED; urgency=low/" \
debian.linaro/changelog
}
true