[oe-commits] [openembedded-core] 01/07: linux-yocto: Handle /bin/awk issues

[git at git.openembedded.org]

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

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

commit a005c357a1e81c0676a4927715cf2fe9782e9a2a
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Aug 22 09:50:50 2017 +0100

    linux-yocto: Handle /bin/awk issues
    
    Add a patch to make the kernel consitently use /usr/bin/awk, not /bin/awk
    to avoid dependency errors.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-kernel/linux/linux-yocto/awk.patch | 87 +++++++++++++++++++++++++
 meta/recipes-kernel/linux/linux-yocto_4.12.bb   |  2 +
 2 files changed, 89 insertions(+)

diff --git a/meta/recipes-kernel/linux/linux-yocto/awk.patch b/meta/recipes-kernel/linux/linux-yocto/awk.patch
new file mode 100644
index 0000000..9163ffb
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto/awk.patch
@@ -0,0 +1,87 @@
+Standardise on /usr/bin/awk, else kernel-devsrc depends on /bin/awk which
+the system doesn't provide and core-image-sato-sdk (which depends on 
+kernel-devsrc) will fail to build.
+
+RP 2017/8/22
+Upstream-Status: Pending
+
+Index: kernel-source/arch/arm/tools/gen-mach-types
+===================================================================
+--- kernel-source.orig/arch/arm/tools/gen-mach-types
++++ kernel-source/arch/arm/tools/gen-mach-types
+@@ -1,4 +1,4 @@
+-#!/bin/awk
++#!/usr/bin/awk
+ #
+ # Awk script to generate include/generated/mach-types.h
+ #
+Index: kernel-source/arch/sh/tools/gen-mach-types
+===================================================================
+--- kernel-source.orig/arch/sh/tools/gen-mach-types
++++ kernel-source/arch/sh/tools/gen-mach-types
+@@ -1,4 +1,4 @@
+-#!/bin/awk
++#!/usr/bin/awk
+ #
+ # Awk script to generate include/generated/machtypes.h
+ # Heavily based on arch/arm/tools/gen-mach-types
+Index: kernel-source/arch/x86/tools/distill.awk
+===================================================================
+--- kernel-source.orig/arch/x86/tools/distill.awk
++++ kernel-source/arch/x86/tools/distill.awk
+@@ -1,4 +1,4 @@
+-#!/bin/awk -f
++#!/usr/bin/awk -f
+ # Usage: objdump -d a.out | awk -f distill.awk | ./test_get_len
+ # Distills the disassembly as follows:
+ # - Removes all lines except the disassembled instructions.
+Index: kernel-source/arch/x86/tools/gen-insn-attr-x86.awk
+===================================================================
+--- kernel-source.orig/arch/x86/tools/gen-insn-attr-x86.awk
++++ kernel-source/arch/x86/tools/gen-insn-attr-x86.awk
+@@ -1,4 +1,4 @@
+-#!/bin/awk -f
++#!/usr/bin/awk -f
+ # gen-insn-attr-x86.awk: Instruction attribute table generator
+ # Written by Masami Hiramatsu <mhiramat at redhat.com>
+ #
+Index: kernel-source/tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk
+===================================================================
+--- kernel-source.orig/tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk
++++ kernel-source/tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk
+@@ -1,4 +1,4 @@
+-#!/bin/awk -f
++#!/usr/bin/awk -f
+ # gen-insn-attr-x86.awk: Instruction attribute table generator
+ # Written by Masami Hiramatsu <mhiramat at redhat.com>
+ #
+Index: kernel-source/tools/perf/arch/x86/tests/gen-insn-x86-dat.awk
+===================================================================
+--- kernel-source.orig/tools/perf/arch/x86/tests/gen-insn-x86-dat.awk
++++ kernel-source/tools/perf/arch/x86/tests/gen-insn-x86-dat.awk
+@@ -1,4 +1,4 @@
+-#!/bin/awk -f
++#!/usr/bin/awk -f
+ # gen-insn-x86-dat.awk: script to convert data for the insn-x86 test
+ # Copyright (c) 2015, Intel Corporation.
+ #
+Index: kernel-source/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk
+===================================================================
+--- kernel-source.orig/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk
++++ kernel-source/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk
+@@ -1,4 +1,4 @@
+-#!/bin/awk -f
++#!/usr/bin/awk -f
+ # gen-insn-attr-x86.awk: Instruction attribute table generator
+ # Written by Masami Hiramatsu <mhiramat at redhat.com>
+ #
+Index: kernel-source/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk
+===================================================================
+--- kernel-source.orig/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk
++++ kernel-source/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk
+@@ -1,4 +1,4 @@
+-#!/bin/awk -f
++#!/usr/bin/awk -f
+ 
+ # Modify SRCU for formal verification. The first argument should be srcu.h and
+ # the second should be srcu.c. Outputs modified srcu.h and srcu.c into the
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
index d491a52..df1d116 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
@@ -42,3 +42,5 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
 KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
 KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
 KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
+
+SRC_URI += "file://awk.patch"

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