diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-08-14 11:31:29 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-21 15:29:01 +0100 |
commit | eb8a9e10ad2a9000f0d4e807d9b87fdbf9f68015 (patch) | |
tree | 4356d8d6737d98c8006c5243a4a757c1ae9282b5 | |
parent | 20946c63c272b2128e6dc76490313b174ee97d8e (diff) | |
download | poky-eb8a9e10ad2a9000f0d4e807d9b87fdbf9f68015.tar.gz |
kernel-devsrc: tweak for v5.3+
The 5.3 kernel has two changes that require tweaks to the minimal
kernel-devsrc package.
- 4ce97317f [x86/purgatory: Do not use __builtin_memcpy and __builtin_memset]
This change removes the need for arch/x86/purgatory/string.c and
instead reuses a copy in arch/x86/boot/compressed/, so we can't copy
the file anymore. To support older kernels, we make the copy survive
the non-existence of the file.
- b1663d7e [docs: Kbuild/Makefile: allow check for missing docs at build time]
This change adds the sourceing of Documentation/Kbuild to the top
level Kbuild file. So we now leave the copy of Documention/'s Kbuild
in the devsrc.
(From OE-Core rev: 53e975c18a14ddb8ad7eab23c8e18e05517953cd)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/kernel-devsrc.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 5ec5929735..3900489ac5 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb | |||
@@ -65,7 +65,6 @@ do_install() { | |||
65 | ) | 65 | ) |
66 | 66 | ||
67 | # then drop all but the needed Makefiles/Kconfig files | 67 | # then drop all but the needed Makefiles/Kconfig files |
68 | rm -rf $kerneldir/build/Documentation | ||
69 | rm -rf $kerneldir/build/scripts | 68 | rm -rf $kerneldir/build/scripts |
70 | rm -rf $kerneldir/build/include | 69 | rm -rf $kerneldir/build/include |
71 | 70 | ||
@@ -205,11 +204,12 @@ do_install() { | |||
205 | cp -a --parents arch/x86/purgatory/sha256.c $kerneldir/build/ 2>/dev/null || : | 204 | cp -a --parents arch/x86/purgatory/sha256.c $kerneldir/build/ 2>/dev/null || : |
206 | 205 | ||
207 | cp -a --parents arch/x86/purgatory/stack.S $kerneldir/build/ | 206 | cp -a --parents arch/x86/purgatory/stack.S $kerneldir/build/ |
208 | cp -a --parents arch/x86/purgatory/string.c $kerneldir/build/ | 207 | cp -a --parents arch/x86/purgatory/string.c $kerneldir/build/ 2>/dev/null || : |
209 | cp -a --parents arch/x86/purgatory/setup-x86_64.S $kerneldir/build/ | 208 | cp -a --parents arch/x86/purgatory/setup-x86_64.S $kerneldir/build/ |
210 | cp -a --parents arch/x86/purgatory/entry64.S $kerneldir/build/ | 209 | cp -a --parents arch/x86/purgatory/entry64.S $kerneldir/build/ |
211 | cp -a --parents arch/x86/boot/string.h $kerneldir/build/ | 210 | cp -a --parents arch/x86/boot/string.h $kerneldir/build/ |
212 | cp -a --parents arch/x86/boot/string.c $kerneldir/build/ | 211 | cp -a --parents arch/x86/boot/string.c $kerneldir/build/ |
212 | cp -a --parents arch/x86/boot/compressed/string.c $kerneldir/build/ 2>/dev/null || : | ||
213 | cp -a --parents arch/x86/boot/ctype.h $kerneldir/build/ | 213 | cp -a --parents arch/x86/boot/ctype.h $kerneldir/build/ |
214 | fi | 214 | fi |
215 | 215 | ||