[Buildroot] [PATCH 1/1] package/trace-cmd: bump to version 2.9.1

[Buildroot] [PATCH 1/1] package/trace-cmd: bump to version 2.9.1

[Alexander Egorenkov]

- This also fixes gcc 10 issues

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
---
 .../0001-Cross-compilation-fixes.patch        | 11 ++++++
 ...0001-trace-listen-add-missing-header.patch | 38 -------------------
 package/trace-cmd/trace-cmd.hash              |  4 +-
 package/trace-cmd/trace-cmd.mk                | 10 ++---
 4 files changed, 18 insertions(+), 45 deletions(-)
 create mode 100644 package/trace-cmd/0001-Cross-compilation-fixes.patch
 delete mode 100644 package/trace-cmd/0001-trace-listen-add-missing-header.patch

diff --git a/package/trace-cmd/0001-Cross-compilation-fixes.patch b/package/trace-cmd/0001-Cross-compilation-fixes.patch
new file mode 100644
index 0000000000..07428204fe
--- /dev/null
+++ b/package/trace-cmd/0001-Cross-compilation-fixes.patch
@@ -0,0 +1,11 @@
+--- a/Makefile	2020-08-29 15:22:39.372570375 +0200
++++ b/Makefile	2020-08-29 15:31:53.774594656 +0200
+@@ -235,6 +235,8 @@
+ CPPFLAGS ?=
+ LDFLAGS ?=
+ 
++CFLAGS += $(EXTRA_CFLAGS)
++
+ VSOCK_DEFINED := $(shell if (echo "$(pound)include <linux/vm_sockets.h>" | $(CC) -E - >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
+ 
+ export VSOCK_DEFINED
diff --git a/package/trace-cmd/0001-trace-listen-add-missing-header.patch b/package/trace-cmd/0001-trace-listen-add-missing-header.patch
deleted file mode 100644
index 350e523025..0000000000
--- a/package/trace-cmd/0001-trace-listen-add-missing-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-
diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash
index c6447f34d4..91c0512d5f 100644
--- a/package/trace-cmd/trace-cmd.hash
+++ b/package/trace-cmd/trace-cmd.hash
@@ -1,4 +1,4 @@
 # Locally computed
-sha256 3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0  trace-cmd-trace-cmd-v2.7.tar.gz
-sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
+sha256 f7d591ac13ac3de004aa69fa3c2d333f620bb29ad0fec064ec215f488588b333  trace-cmd-trace-cmd-v2.9.1.tar.gz
+sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb  COPYING
 sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9  COPYING.LIB
diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
index dfca6a170d..59924aebf3 100644
--- a/package/trace-cmd/trace-cmd.mk
+++ b/package/trace-cmd/trace-cmd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TRACE_CMD_VERSION = trace-cmd-v2.7
+TRACE_CMD_VERSION = trace-cmd-v2.9.1
 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
@@ -37,17 +37,17 @@ TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
 TRACE_CMD_CPPFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CPPFLAGS))
 
 define TRACE_CMD_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TRACE_CMD_CFLAGS)" \
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) \
+		EXTRA_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 $(@D)/tracecmd/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
+	$(INSTALL) -D -m 0755 $(@D)/lib/traceevent/plugins/plugin_*.so $(TARGET_DIR)/usr/lib/trace-cmd/plugins
 endef
 
 $(eval $(generic-package))
-- 
2.28.0

[Buildroot] [PATCH 1/1] package/trace-cmd: bump to version 2.9.1

[Thomas Petazzoni]

Hello,

On Sat, 29 Aug 2020 15:45:29 +0200
Alexander Egorenkov <egorenar-dev@posteo.net> wrote:

> - This also fixes gcc 10 issues

Do we have autobuilder reports of those build issues ?

> diff --git a/package/trace-cmd/0001-Cross-compilation-fixes.patch b/package/trace-cmd/0001-Cross-compilation-fixes.patch
> new file mode 100644
> index 0000000000..07428204fe
> --- /dev/null
> +++ b/package/trace-cmd/0001-Cross-compilation-fixes.patch

All patches need a description + Signed-off-by, and should be generated
with "git format-patch -N" when the upstream project uses git, which I
guess is the case here.

> diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash
> index c6447f34d4..91c0512d5f 100644
> --- a/package/trace-cmd/trace-cmd.hash
> +++ b/package/trace-cmd/trace-cmd.hash
> @@ -1,4 +1,4 @@
>  # Locally computed
> -sha256 3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0  trace-cmd-trace-cmd-v2.7.tar.gz
> -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
> +sha256 f7d591ac13ac3de004aa69fa3c2d333f620bb29ad0fec064ec215f488588b333  trace-cmd-trace-cmd-v2.9.1.tar.gz
> +sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb  COPYING

The hash of COPYING has changed, what are the changes ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] package/trace-cmd: bump to version 2.9.1

[Thomas Petazzoni]

Hello,

On Sat, 29 Aug 2020 17:23:53 +0200
Alexander Egorenkov <egorenar@posteo.net> wrote:

> Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:
> 
> >> - This also fixes gcc 10 issues  
> >
> > Do we have autobuilder reports of those build issues ?
> >  
> 
> Not sure but i'm getting a multiple definitions error with binutils 2.34
> and gcc 10.2 which wasn't there with gcc 9.

http://autobuild.buildroot.net/index.php?symbols%5BBR2_PACKAGE_TRACE_CMD%5D=y&symbols%5BBR2_TOOLCHAIN_GCC_AT_LEAST_10%5D=y

gives the list of configurations that had BR2_PACKAGE_TRACE_CMD=y and
are using gcc 10.x. And it turns out that all of them failed for other
reasons, most likely before even reaching the point where trace-cmd
would be built.

> >> --- a/package/trace-cmd/trace-cmd.hash
> >> +++ b/package/trace-cmd/trace-cmd.hash
> >> @@ -1,4 +1,4 @@
> >>  # Locally computed
> >> -sha256 3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0  trace-cmd-trace-cmd-v2.7.tar.gz
> >> -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
> >> +sha256 f7d591ac13ac3de004aa69fa3c2d333f620bb29ad0fec064ec215f488588b333  trace-cmd-trace-cmd-v2.9.1.tar.gz
> >> +sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb  COPYING  
> >
> > The hash of COPYING has changed, what are the changes ?
> 
> The license didn't change, it has been moved to the files
> LICENSES/GPL-2.0 and LICENSES/LGPL-2.1 instead. And the file COPYING
> contains now references to those files. Not sure why it wasn't done for
> COPYING.LIB though.

At least the hash changed, so we normally want to explain that in the
commit log.

Could you at least rework the patch fixing the cross-compilation issue
to have a proper commit log + Signed-off-by, and be generated using git
format-patch ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] package/trace-cmd: bump to version 2.9.1

[Alexander Egorenkov]

>
> Could you at least rework the patch fixing the cross-compilation issue
> to have a proper commit log + Signed-off-by, and be generated using git
> format-patch ?

Sorry, i'm new to submitting buildroot patches, i'll try to do better in the future,
i know you guys have better things to do. I posted the second version yesterday,
please take a look at it.

Thanks
Alex