Fix 6.3.7 build issue.

packages/devel/libtraceevent/package.mk

@@ -7,7 +7,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://git.kernel.org/pub/scm/libs/libtrace/${PKG_NAME}.git/log/"
 PKG_URL="https://git.kernel.org/pub/scm/libs/libtrace/${PKG_NAME}.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain linux"
+PKG_DEPENDS_TARGET="toolchain libtraceevent:host linux:host"
 PKG_LONGDESC="Provides APIs to access kernel tracepoint events."
 PKG_BUILD_FLAGS="+pic"
 
@@ -26,8 +26,8 @@ makeinstall_target() {
   mkdir -p ${SYSROOT_PREFIX}/usr/lib
   cp lib/${PKG_NAME}.a ${SYSROOT_PREFIX}/usr/lib
 
-  mkdir -p ${SYSROOT_PREFIX}/usr/include
-  cp include/traceevent/* ${SYSROOT_PREFIX}/usr/include
+  mkdir -p ${SYSROOT_PREFIX}/usr/include/traceevent
+  cp include/traceevent/* ${SYSROOT_PREFIX}/usr/include/traceevent
 
   mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
   cp ${PKG_NAME}.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig

packages/kernel/linux/package.mk

@@ -26,7 +26,7 @@ fi
 
 if [ "${PKG_BUILD_PERF}" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= ${PKG_KERNEL_CFG_FILE}; then
   PKG_BUILD_PERF="yes"
-  PKG_DEPENDS_TARGET+=" binutils elfutils libunwind zlib openssl"
+  PKG_DEPENDS_TARGET+=" binutils elfutils libunwind zlib openssl libtraceevent libtracefs"
 fi
 
 if [[ "${TARGET_ARCH}" =~ i*86|x86_64 ]]; then

packages/kernel/linux/patches/AMD64/006-build-fix.patch

@@ -0,0 +1,42 @@
+diff -rupN linux-6.3.7.orig/tools/perf/util/debug.c linux-6.3.7/tools/perf/util/debug.c
+--- linux-6.3.7.orig/tools/perf/util/debug.c	2023-06-13 10:58:18.894087434 +0000
++++ linux-6.3.7/tools/perf/util/debug.c	2023-06-13 11:17:05.344846060 +0000
+@@ -235,14 +235,12 @@ int perf_debug_option(const char *str)
+ 	/* Allow only verbose value in range (0, 10), otherwise set 0. */
+ 	verbose = (verbose < 0) || (verbose > 10) ? 0 : verbose;
+ 
+-#if LIBTRACEEVENT_VERSION >= MAKE_LIBTRACEEVENT_VERSION(1, 3, 0)
+ 	if (verbose == 1)
+ 		tep_set_loglevel(TEP_LOG_INFO);
+ 	else if (verbose == 2)
+ 		tep_set_loglevel(TEP_LOG_DEBUG);
+ 	else if (verbose >= 3)
+ 		tep_set_loglevel(TEP_LOG_ALL);
+-#endif
+ 	return 0;
+ }
+ 
+diff -rupN linux-6.3.7.orig/tools/perf/util/trace-event.h linux-6.3.7/tools/perf/util/trace-event.h
+--- linux-6.3.7.orig/tools/perf/util/trace-event.h	2023-06-13 10:58:18.898087572 +0000
++++ linux-6.3.7/tools/perf/util/trace-event.h	2023-06-13 11:26:19.431910684 +0000
+@@ -140,20 +140,11 @@ int common_lock_depth(struct scripting_c
+ #define SAMPLE_FLAGS_BUF_SIZE 64
+ int perf_sample__sprintf_flags(u32 flags, char *str, size_t sz);
+ 
+-#if defined(LIBTRACEEVENT_VERSION) &&  LIBTRACEEVENT_VERSION >= MAKE_LIBTRACEEVENT_VERSION(1, 5, 0)
+ #include <traceevent/event-parse.h>
+ 
+ static inline bool tep_field_is_relative(unsigned long flags)
+ {
+ 	return (flags & TEP_FIELD_IS_RELATIVE) != 0;
+ }
+-#else
+-#include <linux/compiler.h>
+-
+-static inline bool tep_field_is_relative(unsigned long flags __maybe_unused)
+-{
+-	return false;
+-}
+-#endif
+ 
+ #endif /* _PERF_UTIL_TRACE_EVENT_H */