Skip to contentSkip to conversation

package/trace-cmd: bump to version 2.9.1

PATCH Superseded Norbert Lange 2 participants 4 messages Nov 3, 2020 – Dec 2, 2020

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/trace-cmd: bump to version 2.9.1

Drop upstreamed patch.

Remove now unneeded option -fcommon.

Rearrange the CFLAGS, dont know if the
_LARGEFILE64_SOURCE filter is still needed.

use install_cmd target for installation,
which also installs bash-completion files.

Directory structure changed, in the future the all target might build kernelshark. so specify the *cmd targets.

---
v1->v2
* specify prefix to /usr
v2->v3
* also specify etcdir, used for bash_completion

---
 ...0001-trace-listen-add-missing-header.patch | 38 -------------------
 package/trace-cmd/trace-cmd.hash              |  6 +--
 package/trace-cmd/trace-cmd.mk                | 26 ++++++-------
 3 files changed, 16 insertions(+), 54 deletions(-)
 delete mode 100644 package/trace-cmd/0001-trace-listen-add-missing-header.patch
package/trace-cmd/0001-trace-listen-add-missing-header.patch deleted +0 -38
deleted file mode 100644
index 350e523025..0000000000
@@ -1,38 +0,0 @@
-From c68c868b573acc73e144312326750be2ed96632f Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-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 <[email protected]>
----
-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
-
package/trace-cmd/trace-cmd.hash +3 -3
index c6447f34d4..d1e7f2dbb2 100644
@@ -1,4 +1,4 @@
 # Locally computed
-sha256 3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0  trace-cmd-trace-cmd-v2.7.tar.gz
-sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
-sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9  COPYING.LIB
+sha256  9404fc3cf540ea795304608068c9db6cdb38b90584c7f3c43249785913d54b38  trace-cmd-v2.9.1.tar.gz
+sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
+sha256  70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9  COPYING.LIB
package/trace-cmd/trace-cmd.mk +13 -13
index dfca6a170d..5ad1f65c4a 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-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_VERSION = 2.9.1
+TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz
+TRACE_CMD_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot
 TRACE_CMD_INSTALL_STAGING = YES
 TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1
 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
@@ -17,12 +17,14 @@ ifeq ($(BR2_PACKAGE_AUDIT),y)
 TRACE_CMD_DEPENDENCIES += audit
 endif
 
+TRACE_CMD_MAKE_OPTS = prefix=/usr etcdir=/etc
+
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 TRACE_CMD_DEPENDENCIES += python host-swig
-TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python
+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
+TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3
 else
 TRACE_CMD_MAKE_OPTS += NO_PYTHON=1
 endif
@@ -37,17 +39,15 @@ 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)" \
-		CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \
-		$(TRACE_CMD_MAKE_OPTS) \
-		-C $(@D) all
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TRACE_CMD_CFLAGS)" \
+	CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \
+		$(MAKE) $(TRACE_CMD_MAKE_OPTS) \
+			-C $(@D) trace-cmd
 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
+	DESTDIR=$(TARGET_DIR) $(MAKE) $(TRACE_CMD_MAKE_OPTS) -C $(@D) install_cmd
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.28.0
#1 lore raw

PATCH v3 1/1 package/trace-cmd: bump to version 2.9.1

Hi Norbert,

Quoted 26 lines · Norbert Lange

Drop upstreamed patch.

Remove now unneeded option -fcommon.

Rearrange the CFLAGS, dont know if the
_LARGEFILE64_SOURCE filter is still needed.

use install_cmd target for installation,
which also installs bash-completion files.

Directory structure changed, in the future the all target might build kernelshark. so specify the *cmd targets.

---
v1->v2
* specify prefix to /usr
v2->v3
* also specify etcdir, used for bash_completion

---
 ...0001-trace-listen-add-missing-header.patch | 38 -------------------
 package/trace-cmd/trace-cmd.hash              |  6 +--
 package/trace-cmd/trace-cmd.mk                | 26 ++++++-------
 3 files changed, 16 insertions(+), 54 deletions(-)
 delete mode 100644 package/trace-cmd/0001-trace-listen-add-missing-header.patch

[snip]

package/trace-cmd/trace-cmd.hash line 2

Quoted 10 lines
package/trace-cmd/trace-cmd.hash +1 -3
index c6447f34d4..d1e7f2dbb2 100644
@@ -1,4 +1,4 @@
 # Locally computed
-sha256 3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0  trace-cmd-trace-cmd-v2.7.tar.gz
-sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
-sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9  COPYING.LIB
+sha256  9404fc3cf540ea795304608068c9db6cdb38b90584c7f3c43249785913d54b38  trace-cmd-v2.9.1.tar.gz

Would be nice to mention in the commit message that the spaces change.

package/trace-cmd/trace-cmd.hash line 3

Quoted 1 line
package/trace-cmd/trace-cmd.hash +1 -0
+sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING

The hash of COPYING has changed. That's because the license files are now in
LICENSES/. Can you update things accordingly?

package/trace-cmd/trace-cmd.hash line 4

Quoted 1 line
package/trace-cmd/trace-cmd.hash +1 -0
+sha256  70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9  COPYING.LIB

This one hasn't changed, but probably it's better to refer to the new location
as well.

Quoted 5 lines
package/trace-cmd/trace-cmd.mk +0 -0
index dfca6a170d..5ad1f65c4a 100644

package/trace-cmd/trace-cmd.mk line 9

Quoted 9 lines
package/trace-cmd/trace-cmd.mk +3 -3
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-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_VERSION = 2.9.1
+TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz
+TRACE_CMD_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot

Would be nice to mention this in the commit message as well.

Quoted 22 lines
package/trace-cmd/trace-cmd.mk +4 -2
 TRACE_CMD_INSTALL_STAGING = YES
 TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1
 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
@@ -17,12 +17,14 @@ ifeq ($(BR2_PACKAGE_AUDIT),y)
 TRACE_CMD_DEPENDENCIES += audit
 endif
 
+TRACE_CMD_MAKE_OPTS = prefix=/usr etcdir=/etc
+
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 TRACE_CMD_DEPENDENCIES += python host-swig
-TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python
+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
+TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3
 else
 TRACE_CMD_MAKE_OPTS += NO_PYTHON=1
 endif
@@ -37,17 +39,15 @@ TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
 TRACE_CMD_CPPFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CPPFLAGS))

package/trace-cmd/trace-cmd.mk TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) · line 44

Quoted 10 lines
package/trace-cmd/trace-cmd.mk +3 -5
 
 define TRACE_CMD_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TRACE_CMD_CFLAGS)" \
-		CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \
-		$(TRACE_CMD_MAKE_OPTS) \
-		-C $(@D) all
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TRACE_CMD_CFLAGS)" \
+	CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \

Can you explain in the commit message why these are passed in the environment
now instead of on the command line?

Regards,
Arnout

Quoted 13 lines
package/trace-cmd/trace-cmd.mk +3 -3
+		$(MAKE) $(TRACE_CMD_MAKE_OPTS) \
+			-C $(@D) trace-cmd
 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
+	DESTDIR=$(TARGET_DIR) $(MAKE) $(TRACE_CMD_MAKE_OPTS) -C $(@D) install_cmd
 endef
 
 $(eval $(generic-package))
#2 lore raw

PATCH v3 1/1 package/trace-cmd: bump to version 2.9.1

Am Di., 1. Dez. 2020 um 21:35 Uhr schrieb Arnout Vandecappelle <[email protected]>:

Quoted 32 lines

Hi Norbert,

Quoted 26 lines · Norbert Lange

Drop upstreamed patch.

Remove now unneeded option -fcommon.

Rearrange the CFLAGS, dont know if the
_LARGEFILE64_SOURCE filter is still needed.

use install_cmd target for installation,
which also installs bash-completion files.

Directory structure changed, in the future the all target might build kernelshark. so specify the *cmd targets.

---
v1->v2
* specify prefix to /usr
v2->v3
* also specify etcdir, used for bash_completion

---
 ...0001-trace-listen-add-missing-header.patch | 38 -------------------
 package/trace-cmd/trace-cmd.hash              |  6 +--
 package/trace-cmd/trace-cmd.mk                | 26 ++++++-------
 3 files changed, 16 insertions(+), 54 deletions(-)
 delete mode 100644 package/trace-cmd/0001-trace-listen-add-missing-header.patch

[snip]

Quoted 12 lines

package/trace-cmd/trace-cmd.hash line 2

Quoted 10 lines
package/trace-cmd/trace-cmd.hash +1 -3
index c6447f34d4..d1e7f2dbb2 100644
@@ -1,4 +1,4 @@
 # Locally computed
-sha256 3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0  trace-cmd-trace-cmd-v2.7.tar.gz
-sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
-sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9  COPYING.LIB
+sha256  9404fc3cf540ea795304608068c9db6cdb38b90584c7f3c43249785913d54b38  trace-cmd-v2.9.1.tar.gz

Would be nice to mention in the commit message that the spaces change.

Ok

Quoted 5 lines

package/trace-cmd/trace-cmd.hash line 3

Quoted 2 lines
package/trace-cmd/trace-cmd.hash +1 -0
+sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING

The hash of COPYING has changed. That's because the license files are now in
LICENSES/. Can you update things accordingly?

Sure

Quoted 5 lines

package/trace-cmd/trace-cmd.hash line 4

Quoted 2 lines
package/trace-cmd/trace-cmd.hash +1 -0
+sha256  70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9  COPYING.LIB

This one hasn't changed, but probably it's better to refer to the new location
as well.

You mean I should mention the new location in the commit? (Doesnt really address this specific line)

Quoted 9 lines
Quoted 9 lines
package/trace-cmd/trace-cmd.mk +0 -0
index dfca6a170d..5ad1f65c4a 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
Quoted 8 lines

package/trace-cmd/trace-cmd.mk line 9

Quoted 6 lines
package/trace-cmd/trace-cmd.mk +3 -3
-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_VERSION = 2.9.1
+TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz
+TRACE_CMD_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot

Would be nice to mention this in the commit message as well.

Ok, see below

Quoted 24 lines
Quoted 24 lines
package/trace-cmd/trace-cmd.mk +4 -2
 TRACE_CMD_INSTALL_STAGING = YES
 TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1
 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
@@ -17,12 +17,14 @@ ifeq ($(BR2_PACKAGE_AUDIT),y)
 TRACE_CMD_DEPENDENCIES += audit
 endif
 
+TRACE_CMD_MAKE_OPTS = prefix=/usr etcdir=/etc
+
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 TRACE_CMD_DEPENDENCIES += python host-swig
-TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python
+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
+TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3
 else
 TRACE_CMD_MAKE_OPTS += NO_PYTHON=1
 endif
@@ -37,17 +39,15 @@ TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
 TRACE_CMD_CPPFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CPPFLAGS))
 
Quoted 12 lines

package/trace-cmd/trace-cmd.mk TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) · line 44

Quoted 9 lines
package/trace-cmd/trace-cmd.mk +3 -5
 define TRACE_CMD_BUILD_CMDS
-     $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-             CFLAGS="$(TRACE_CMD_CFLAGS)" \
-             CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \
-             $(TRACE_CMD_MAKE_OPTS) \
-             -C $(@D) all
+     $(TARGET_CONFIGURE_OPTS) \
+     CFLAGS="$(TRACE_CMD_CFLAGS)" \
+     CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \

Can you explain in the commit message why these are passed in the environment
now instead of on the command line?

I do a "normal" build now, instead of using a fragment in a subdirectory. Means the Makefile would like to do stuff like adding include paths which doesnt work if the variables are overriden.

As rationale I would use: "Thats the way you normally build packages", aswell as "Thats how you would DL the source" (instead of doing a git fetch, in regards to last point).
Of course I don't know why it was done in a entirely different manner before, so I might be missing something

Norbert

#3 lore raw

PATCH v3 1/1 package/trace-cmd: bump to version 2.9.1

Quoted 5 lines · Norbert Lange

Am Di., 1. Dez. 2020 um 21:35 Uhr schrieb Arnout Vandecappelle <[email protected]>:

Quoted 4 lines

Hi Norbert,

On 03/11/2020 16:53, Norbert Lange wrote:

[snip]

Quoted 10 lines
Quoted 10 lines
Quoted 9 lines

define TRACE_CMD_BUILD_CMDS

package/trace-cmd/trace-cmd.mk +3 -5
-     $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-             CFLAGS="$(TRACE_CMD_CFLAGS)" \
-             CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \
-             $(TRACE_CMD_MAKE_OPTS) \
-             -C $(@D) all
+     $(TARGET_CONFIGURE_OPTS) \
+     CFLAGS="$(TRACE_CMD_CFLAGS)" \
+     CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \
Quoted 4 lines
Quoted 2 lines

Can you explain in the commit message why these are passed in the environment
now instead of on the command line?

I do a "normal" build now, instead of using a fragment in a subdirectory.

Err... Before it was "make all", where do you see the anything about a fragment
in a subdirectory?

Quoted 2 lines

Means the Makefile would like to do stuff like adding include paths which doesnt work if the variables are overriden.

Yes, that's exactly the kind of explanation I would expect in the commit message.

Quoted 4 lines

As rationale I would use: "Thats the way you normally build packages", aswell as "Thats how you would DL the source" (instead of doing a git fetch, in regards to last point).

It was git before because kernel.org has only recently started supporting
tarball downloads from git (where "recently" is about a year ago I think, maybe even two).

Regards,
Arnout

Quoted 5 lines

Of course I don't know why it was done in a entirely different manner before, so I might be missing something

Norbert