[oe-commits] [openembedded-core] 44/54: kernel-devsrc: tweak for v5.3+

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch warrior
in repository openembedded-core.

commit ef7a387c8045af08e5db171e944656b9bf15f598
Author: Bruce Ashfield <bruce.ashfield at gmail.com>
AuthorDate: Wed Aug 14 11:31:29 2019 -0400

    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.
    
    Signed-off-by: Bruce Ashfield <bruce.ashfield at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 5ec5929..3900489 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -65,7 +65,6 @@ do_install() {
     )
 
     # then drop all but the needed Makefiles/Kconfig files
-    rm -rf $kerneldir/build/Documentation
     rm -rf $kerneldir/build/scripts
     rm -rf $kerneldir/build/include
 
@@ -205,11 +204,12 @@ do_install() {
 	    cp -a --parents arch/x86/purgatory/sha256.c $kerneldir/build/ 2>/dev/null || :
 
 	    cp -a --parents arch/x86/purgatory/stack.S $kerneldir/build/
-	    cp -a --parents arch/x86/purgatory/string.c $kerneldir/build/
+	    cp -a --parents arch/x86/purgatory/string.c $kerneldir/build/ 2>/dev/null || :
 	    cp -a --parents arch/x86/purgatory/setup-x86_64.S $kerneldir/build/
 	    cp -a --parents arch/x86/purgatory/entry64.S $kerneldir/build/
 	    cp -a --parents arch/x86/boot/string.h $kerneldir/build/
 	    cp -a --parents arch/x86/boot/string.c $kerneldir/build/
+	    cp -a --parents arch/x86/boot/compressed/string.c $kerneldir/build/ 2>/dev/null || :
 	    cp -a --parents arch/x86/boot/ctype.h $kerneldir/build/
 	fi
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.