Skip to contentSkip to conversation

package/trace-cmd: bump to version 2.9.1

PATCH New Norbert Lange 2 participants 4 messages Dec 3, 2020 – Jan 4, 2021

lore
Share & tools
lore
#0 lore raw

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

Layout in upstream changed, trace-cmd is now moved into a subdirectory as multiple other components are included. This changes how a build should be done, CFLAGS are now passed through the environment, as the build needs to add stuff like include paths.

Build now uses the trace-cmd target and Installation uses the install_cmd target.
This ensures all related components(bash-completion, plugins) are built and installed, and nothing else.

For while, its possible to download a tar archive, which is simpler than doing a git checkout and packaging.

Drop upstreamed patch.

Remove now unneeded option -fcommon.
(dont know if the _LARGEFILE64_SOURCE filter is still needed)

Change to 2-spaces in trace-cmd.hash file.

Recalculate hash for COPYING, this changes as referenced license files were moved to a LICENSE subdirectory.

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

*   Fix COPYING hash
*   use official git repo (according to README)
*   Improve commit message
---
 ...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..56d3766910 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  b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb  COPYING
+sha256  70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9  COPYING.LIB
package/trace-cmd/trace-cmd.mk +13 -13
index dfca6a170d..bc901c5631 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/utils/trace-cmd/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.29.2
#1 lore raw

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

Norbert, All,

On 2020-12-03 11:48 +0100, Norbert Lange spake thusly:

Quoted 19 lines

Layout in upstream changed, trace-cmd is now moved into a subdirectory as multiple other components are included. This changes how a build should be done, CFLAGS are now passed through the environment, as the build needs to add stuff like include paths.

Build now uses the trace-cmd target and Installation uses the install_cmd target.
This ensures all related components(bash-completion, plugins) are built and installed, and nothing else.

For while, its possible to download a tar archive, which is simpler than doing a git checkout and packaging.

Drop upstreamed patch.

Remove now unneeded option -fcommon.
(dont know if the _LARGEFILE64_SOURCE filter is still needed)

Quoted 6 lines

Change to 2-spaces in trace-cmd.hash file.

Recalculate hash for COPYING, this changes as referenced license files were moved to a LICENSE subdirectory.

I had to do quite a few changes to make that eventually work:

- keep using a git clone
- unbreak the build:
- use the default make target rule, or the plugins and python bindings be built at install time, with the host compiler
- use the default install target rule
- expand commit log:
- detail buildsystem issues

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 139 lines

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

*   Fix COPYING hash
*   use official git repo (according to README)
*   Improve commit message
---
 ...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..56d3766910 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  b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb  COPYING
+sha256  70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9  COPYING.LIB
package/trace-cmd/trace-cmd.mk +13 -13
index dfca6a170d..bc901c5631 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/utils/trace-cmd/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 · 6 lines
2.29.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

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

Hello Yann,

Yann E. MORIN <[email protected]> schrieb am So., 3. J?n. 2021, 12:09:

Quoted 24 lines

Norbert, All,

On 2020-12-03 11:48 +0100, Norbert Lange spake thusly:

Quoted 21 lines

Layout in upstream changed, trace-cmd is now moved into a subdirectory as multiple other components are included. This changes how a build should be done, CFLAGS are now passed through the environment, as the build needs to add stuff like include paths.

Build now uses the trace-cmd target and Installation uses the install_cmd target.
This ensures all related components(bash-completion, plugins) are built and installed, and nothing else.

For while, its possible to download a tar archive, which is simpler than doing a git checkout and packaging.

Drop upstreamed patch.

Remove now unneeded option -fcommon.
(dont know if the _LARGEFILE64_SOURCE filter is still needed)

Change to 2-spaces in trace-cmd.hash file.

Quoted 11 lines
Quoted 4 lines

Recalculate hash for COPYING, this changes as referenced license files were moved to a LICENSE subdirectory.

I had to do quite a few changes to make that eventually work:

- keep using a git clone

Why is a git checkout necessary/preferable ?

- unbreak the build:

Quoted 4 lines

- use the default make target rule, or the plugins and python bindings be built at install time, with the host compiler
- use the default install target rule

ACK, did not catch this

Norbert

Quoted 186 lines

- expand commit log:
- detail buildsystem issues

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 10 lines

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

*   Fix COPYING hash
*   use official git repo (according to README)
*   Improve commit message
Quoted 7 lines
---
 ...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

Quoted 2 lines

diff --git

a/package/trace-cmd/0001-trace-listen-add-missing-header.patch b/package/trace-cmd/0001-trace-listen-add-missing-header.patch

Quoted 5 lines

deleted file mode 100644
index 350e523025..0000000000

package/trace-cmd/0001-trace-listen-add-missing-header.patch line 9

Quoted 9 lines
package/trace-cmd/0001-trace-listen-add-missing-header.patch deleted +0 -9
@@ -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

package/trace-cmd/0001-trace-listen-add-missing-header.patch

Quoted 3 lines
package/trace-cmd/0001-trace-listen-add-missing-header.patch deleted +0 -3
-libc:
-
-.../trace-cmd-trace-cmd-v2.6.1/trace-listen.c: In function

?make_pid_name?:

package/trace-cmd/0001-trace-listen-add-missing-header.patch line 13

Quoted 1 line
package/trace-cmd/0001-trace-listen-add-missing-header.patch deleted +0 -1
-.../trace-cmd-trace-cmd-v2.6.1/trace-listen.c:167:16: error: ?PATH_MAX?

undeclared (first use in this function)

Review

Quoted 26 lines
package/trace-cmd/0001-trace-listen-add-missing-header.patch deleted +0 -25
-  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
-
(quoted diff) +0 -0

b/package/trace-cmd/trace-cmd.hash

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

Quoted 6 lines

index c6447f34d4..56d3766910 100644

package/trace-cmd/trace-cmd.hash +0 -1
@@ -1,4 +1,4 @@
 # Locally computed
-sha256

3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0 trace-cmd-trace-cmd-v2.7.tar.gz

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

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

ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING

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

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

70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB

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

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

9404fc3cf540ea795304608068c9db6cdb38b90584c7f3c43249785913d54b38 trace-cmd-v2.9.1.tar.gz

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

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

b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING

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

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

70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB

package/trace-cmd/

Quoted 1 line
package/trace-cmd/ renamed from package/trace-cmd/trace-cmd.mk +0 -0

trace-cmd.mk

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

Quoted 6 lines

index dfca6a170d..bc901c5631 100644

package/trace-cmd/trace-cmd.mk +0 -0
@@ -4,9 +4,9 @@
 #
 

################################################################################

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

Quoted 3 lines
package/trace-cmd/trace-cmd.mk +0 -2
-TRACE_CMD_VERSION = trace-cmd-v2.7
-TRACE_CMD_SITE =

https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git

package/trace-cmd/trace-cmd.mk

Quoted 4 lines
package/trace-cmd/trace-cmd.mk +3 -1
-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/utils/trace-cmd/trace-cmd.git/snapshot

package/trace-cmd/trace-cmd.mk TRACE_CMD_CFLAGS = $(filter-out

Quoted 21 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))

package/trace-cmd/trace-cmd.mk TRACE_CMD_CFLAGS = $(filter-out · line 39

Quoted 1 line
package/trace-cmd/trace-cmd.mk +0 -0
 TRACE_CMD_CPPFLAGS = $(filter-out

-D_LARGEFILE64_SOURCE,$(TARGET_CPPFLAGS))

Quoted 6 lines
package/trace-cmd/trace-cmd.mk +0 -4
 define TRACE_CMD_BUILD_CMDS
-     $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-             CFLAGS="$(TRACE_CMD_CFLAGS)" \
-             CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \
-             $(TRACE_CMD_MAKE_OPTS) \

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

Quoted 10 lines
package/trace-cmd/trace-cmd.mk +5 -2
-             -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

package/trace-cmd/trace-cmd.mk TRACE_CMD_CFLAGS = $(filter-out · line 49

Quoted 2 lines
package/trace-cmd/trace-cmd.mk +0 -2
-     $(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

package/trace-cmd/trace-cmd.mk TRACE_CMD_CFLAGS = $(filter-out · line 49

Quoted 1 line
package/trace-cmd/trace-cmd.mk +1 -0
+     DESTDIR=$(TARGET_DIR) $(MAKE) $(TRACE_CMD_MAKE_OPTS) -C $(@D)

install_cmd

Quoted 10 lines
package/trace-cmd/trace-cmd.mk +0 -1
 endef
 
 $(eval $(generic-package))
--

2.29.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--

.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___
     |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is
no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v
 conspiracy.  |
Quoted 2 lines

'------------------------------^-------^------------------^--------------------'

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210104/64e9280e/attachment.html>

#3 lore raw

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

Norbert, All,

On 2021-01-04 14:19 +0100, Norbert Lange spake thusly:

Quoted 3 lines

Yann E. MORIN < [1][email protected]> schrieb am So., 3. J?n. 2021, 12:09:
- keep using a git clone
Why is a git checkout necessary/preferable ?

s,necessary/,,

1. It was already a git clone previously

2. git clones are cached locally (so re=usable between builds if pne had exported BR2_DL_DIR ), and git clones are named after the package in Buildroot, not after the upstream repo (but in this case, the basename did not change)

3. That tree is not very big (8.18MiB fetched, for a tarball that is 4.1MiB)

4. Except for the first build, fetching new objects is going to be fast when people update (probably faster than fetching the full archive).

I also have a tendency to prefer git clones, as the archivers on remote sites have been known to change from time to time. For example, github has changed the way they create their archives at least twice in the past few years, which had an impact on our hashes...

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'