perf: improve fixing for buildpaths QA warning

if O=${B} is removed from EXTRA_OEMAKE, perf will compile failed with
error:
| make[2]: *** No rule to make target 'tools/arch/arm64/include/uapi/asm/unistd.h', needed by 'arch/arm64/include/generated/asm/syscalls.c'.  Stop.

Improve to add an extra rel_sysdef for fixing buildpaths QA warning,
and keep original sysdef

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 4f29bd5bbc3ab3e6b21a6432662570647bfd2199..61e2ec0557df08c4084aca1c22ff081a31dbc07c 100644 (file)
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -320,8 +320,12 @@ do_configure:prepend () {
                        "${S}/tools/perf/pmu-events/jevents.py"
     fi
     if [ -e "${S}/tools/perf/arch/arm64/Makefile" ]; then
-       sed -i 's,sysdef := $(srctree)/,sysdef := ,' ${S}/tools/perf/arch/arm64/Makefile
-       sed -i 's,$(incpath) $(sysdef),$(incpath) $(srctree)/$(sysdef) $(sysdef),' ${S}/tools/perf/arch/arm64/Makefile
+       sed -i -E '/^sysdef := \$\(srctree\)\/(.+)/ {
+         h
+         s/^sysdef := \$\(srctree\)\/(.+)/rel_sysdef := \1/
+         G
+       }' ${S}/tools/perf/arch/arm64/Makefile
+       sed -i 's,$(incpath) $(sysdef),$(incpath) $(sysdef) $(rel_sysdef),' ${S}/tools/perf/arch/arm64/Makefile
     fi
     if [ -e "${S}/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl" ]; then
        if ! grep -q input_rel ${S}/tools/perf/arch/arm64/entry/syscalls/mksyscalltbl; then