mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
38
package/trace-cmd/0001-trace-listen-add-missing-header.patch
Normal file
38
package/trace-cmd/0001-trace-listen-add-missing-header.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
From c68c868b573acc73e144312326750be2ed96632f Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 29 Jun 2017 14:43:19 +0300
|
||||
Subject: [PATCH] trace-listen: add missing header
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The PATH_MAX macro requires the limits.h header. This fixes build with musl
|
||||
libc:
|
||||
|
||||
.../trace-cmd-trace-cmd-v2.6.1/trace-listen.c: In function ‘make_pid_name’:
|
||||
.../trace-cmd-trace-cmd-v2.6.1/trace-listen.c:167:16: error: ‘PATH_MAX’ undeclared (first use in this function)
|
||||
snprintf(buf, PATH_MAX, VAR_RUN_DIR "/trace-cmd-net.pid");
|
||||
^~~~~~~~
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://lkml.org/lkml/2017/6/29/286
|
||||
|
||||
trace-listen.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/trace-listen.c b/trace-listen.c
|
||||
index 17ff9d8c160c..838d6bcf3649 100644
|
||||
--- a/trace-listen.c
|
||||
+++ b/trace-listen.c
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
+#include <limits.h>
|
||||
|
||||
#include "trace-local.h"
|
||||
#include "trace-msg.h"
|
||||
--
|
||||
2.11.0
|
||||
|
||||
18
package/trace-cmd/Config.in
Normal file
18
package/trace-cmd/Config.in
Normal file
@@ -0,0 +1,18 @@
|
||||
config BR2_PACKAGE_TRACE_CMD
|
||||
bool "trace-cmd"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
help
|
||||
Command line reader for ftrace.
|
||||
|
||||
To use this profiling tool, you should enable ftrace in your
|
||||
kernel configuration. This command collect traces on your
|
||||
target. You can analyse these traces on the target or on
|
||||
the host via the gui "kernel shark"
|
||||
|
||||
http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
|
||||
|
||||
comment "trace-cmd needs a toolchain w/ threads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
4
package/trace-cmd/trace-cmd.hash
Normal file
4
package/trace-cmd/trace-cmd.hash
Normal file
@@ -0,0 +1,4 @@
|
||||
# Locally computed
|
||||
sha256 3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0 trace-cmd-trace-cmd-v2.7.tar.gz
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB
|
||||
53
package/trace-cmd/trace-cmd.mk
Normal file
53
package/trace-cmd/trace-cmd.mk
Normal file
@@ -0,0 +1,53 @@
|
||||
################################################################################
|
||||
#
|
||||
# trace-cmd
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TRACE_CMD_VERSION = trace-cmd-v2.7
|
||||
TRACE_CMD_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
|
||||
TRACE_CMD_SITE_METHOD = git
|
||||
TRACE_CMD_INSTALL_STAGING = YES
|
||||
TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1
|
||||
TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
|
||||
|
||||
TRACE_CMD_DEPENDENCIES = host-pkgconf
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AUDIT),y)
|
||||
TRACE_CMD_DEPENDENCIES += audit
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
TRACE_CMD_DEPENDENCIES += python host-swig
|
||||
TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python
|
||||
else ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
||||
TRACE_CMD_DEPENDENCIES += python3 host-swig
|
||||
TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python3
|
||||
else
|
||||
TRACE_CMD_MAKE_OPTS += NO_PYTHON=1
|
||||
endif
|
||||
|
||||
# trace-cmd already defines _LARGEFILE64_SOURCE when necessary,
|
||||
# redefining it on the command line causes build problems.
|
||||
TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
|
||||
|
||||
# trace-cmd use CPPFLAGS to add some extra flags.
|
||||
# But like for CFLAGS, $(TARGET_CPPFLAGS) contains _LARGEFILE64_SOURCE
|
||||
# that causes build problems.
|
||||
TRACE_CMD_CPPFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CPPFLAGS))
|
||||
|
||||
define TRACE_CMD_BUILD_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TRACE_CMD_CFLAGS)" \
|
||||
CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \
|
||||
$(TRACE_CMD_MAKE_OPTS) \
|
||||
-C $(@D) all
|
||||
endef
|
||||
|
||||
define TRACE_CMD_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -D -m 0755 $(@D)/trace-cmd $(TARGET_DIR)/usr/bin/trace-cmd
|
||||
$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/trace-cmd/plugins
|
||||
$(INSTALL) -D -m 0755 $(@D)/plugin_*.so $(TARGET_DIR)/usr/lib/trace-cmd/plugins
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user