summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorc-thaler <christian.thaler@tes-dst.com>2019-09-24 14:18:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-15 15:54:01 +0100
commitdba05668f7eaa391c1f635d1605c4f68878ef82c (patch)
treea9f8d918448fdb2204809bbdd3150d8250381324
parent7e20a2238c0ca9cb83f74a60986c3d4a10ac7b48 (diff)
downloadpoky-dba05668f7eaa391c1f635d1605c4f68878ef82c.tar.gz
kernel-devsrc: check for localversion files in the kernel source tree
localversion files are ignored. This might lead to a bad version magic when building out-of-tree modules via SDK. (Backport from master https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta/recipes-kernel/linux/kernel-devsrc.bb?id=59fcee90de0cbb5b6b8333ab2b0e36214b174e52) (From OE-Core rev: 85da4ccfff2103815eb3cd9a0b0f1af122b05567) Signed-off-by: Christian Thaler <christian.thaler@tes-dst.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb9
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 361ad21e1f..ec5cf0993a 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -62,6 +62,12 @@ do_install() {
62 cd ${S} 62 cd ${S}
63 cp --parents $(find -type f -name "Makefile*" -o -name "Kconfig*") $kerneldir/build 63 cp --parents $(find -type f -name "Makefile*" -o -name "Kconfig*") $kerneldir/build
64 cp --parents $(find -type f -name "Build" -o -name "Build.include") $kerneldir/build 64 cp --parents $(find -type f -name "Build" -o -name "Build.include") $kerneldir/build
65
66 # Copy localversion file if any to keep correct version magic after
67 # modules_prepare.
68 if [ -f *localversion* ]; then
69 cp *localversion* $kerneldir/build
70 fi
65 ) 71 )
66 72
67 # then drop all but the needed Makefiles/Kconfig files 73 # then drop all but the needed Makefiles/Kconfig files
@@ -213,6 +219,9 @@ do_install() {
213 219
214 # required to build scripts/selinux/genheaders/genheaders 220 # required to build scripts/selinux/genheaders/genheaders
215 cp -a --parents security/selinux/include/* $kerneldir/build/ 221 cp -a --parents security/selinux/include/* $kerneldir/build/
222
223 # copy any localversion files
224 cp -a localversion* $kerneldir/build/ 2>/dev/null || :
216 ) 225 )
217 226
218 # Make sure the Makefile and version.h have a matching timestamp so that 227 # Make sure the Makefile and version.h have a matching timestamp so that