linux-intel: backport commit to fix perf builds

Fixes:

| /build/build/tmp/work/intel_corei7_64-poky-linux/perf/1.0-r9/recipe-sysroot-native/usr/bin/x86_64-poky-linux/../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/10.1.0/ld:/home/pokybuild/yocto-worker/meta-intel/build/build/tmp/work/intel_corei7_64-poky-linux/perf/1.0-r9/perf-1.0/plugins/libtraceevent-dynamic-list:2: ignoring invalid character `@' in script
| /build/tmp/work/intel_corei7_64-poky-linux/perf/1.0-r9/recipe-sysroot-native/usr/bin/x86_64-poky-linux/../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/10.1.0/ld:/home/pokybuild/yocto-worker/meta-intel/build/build/tmp/work/intel_corei7_64-poky-linux/perf/1.0-r9/perf-1.0/plugins/libtraceevent-dynamic-list:2: ignoring invalid character `@' in script
| /build/tmp/work/intel_corei7_64-poky-linux/perf/1.0-r9/recipe-sysroot-native/usr/bin/x86_64-poky-linux/../../libexec/x86_64-poky-linux/gcc/x86_64-poky-linux/10.1.0/ld:/home/pokybuild/yocto-worker/meta-intel/build/build/tmp/work/intel_corei7_64-poky-linux/perf/1.0-r9/perf-1.0/plugins/libtraceevent-dynamic-list:2: syntax error in dynamic list

Include the patch in recipe for now until it's not in Intel LTS tree.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

2 files changed, 40 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index c6163973..a592d527 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -8,6 +8,7 @@ KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;n
 SRC_URI = " \
            git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
            ${KERNEL_CONFIG_URI} \
+           file://libtraceevent-fix-build-with-binutils-25.patch \
           "
 
 SRC_URI_append = " file://enable_lynxpoint_gpio.cfg"
diff --git a/recipes-kernel/linux/linux-intel/libtraceevent-fix-build-with-binutils-25.patch b/recipes-kernel/linux/linux-intel/libtraceevent-fix-build-with-binutils-25.patch
new file mode 100644
index 00000000..66cb981e
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/libtraceevent-fix-build-with-binutils-25.patch
@@ -0,0 +1,39 @@
+From 1fe4ee7f680c3f69f620d68a5d2f7341e8db693b Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sat, 25 Jul 2020 02:06:23 +0100
+Subject: libtraceevent: Fix build with binutils 2.35
+
+In binutils 2.35, 'nm -D' changed to show symbol versions along with
+symbol names, with the usual @@ separator.  When generating
+libtraceevent-dynamic-list we need just the names, so strip off the
+version suffix if present.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Tested-by: Salvatore Bonaccorso <carnil@debian.org>
+Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
+Cc: linux-trace-devel@vger.kernel.org
+Cc: stable@vger.kernel.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+
+Upstream-Status: Backport [https://github.com/torvalds/linux/commit/39efdd94e314336f4acbac4c07e0f37bdc3bef71]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ tools/lib/traceevent/plugins/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile
+index f440989fa55e..23c3535bcbd6 100644
+--- a/tools/lib/traceevent/plugins/Makefile
++++ b/tools/lib/traceevent/plugins/Makefile
+@@ -196,7 +196,7 @@ define do_generate_dynamic_list_file
+        xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\
+        if [ "$$symbol_type" = "U W" ];then                             \
+                (echo '{';                                              \
+-               $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\
++               $(NM) -u -D $1 | awk 'NF>1 {sub("@.*", "", $$2); print "\t"$$2";"}' | sort -u;\
+                echo '};';                                              \
+                ) > $2;                                                 \
+        else                                                            \
+-- 
+cgit v1.2.2-1-g5e49
+