Skip to contentSkip to conversation

package/strace: needs headers >= 5.1

PATCH In review Bernd Kuhls 2 participants 3 messages Jun 16

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/strace: needs headers >= 5.1

Buildroot commit aa5e3eec6384cb73d902a4de3fffc279683ea5a5 bumped the package to version 7.0 which includes commit
https://github.com/strace/strace/commit/33b950714a966bde816a1f1e75c127c3d3ae53cd
that adds an include of linux/time_types.h.

This header file was added in linux kernel version 5.1:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ca5e9aba753ed15d173c7a7b88e4d402b7ca8121

Fixes build errors:

In file included from ../bundled/linux/include/uapi/linux/cgroupstats.h:20:0,
from netlink_nlctrl.c:11:
../bundled/linux/include/uapi/linux/taskstats.h:21:30: fatal error:
linux/time_types.h: No such file or directory

detected by the Gitlab pipelines with the following defconfigs:
- br-arm-full-static
- bootlin-aarch64-glibc-old

---
Gitlab pipelines passed:
https://gitlab.com/bkuhls/buildroot/-/commits/41eb71afe06e68c5ff27edd9fe3acb1772a871d3

 package/strace/Config.in | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
package/strace/Config.in +3 -14
index ff7d271c0c..e3e7018c65 100644
@@ -1,11 +1,6 @@
 config BR2_PACKAGE_STRACE
 	bool "strace"
-	# needs at least kernel headers 5.0 on xtensa
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_xtensa
-	# needs at least kernel headers 5.0 on musl aarch64
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || \
-		!(BR2_aarch64 || BR2_aarch64_be) || \
-		!BR2_TOOLCHAIN_USES_MUSL
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 # time_types.h
 	depends on !BR2_RISCV_32
 	help
 	  A useful diagnostic, instructional, and debugging tool.
@@ -17,11 +12,5 @@ config BR2_PACKAGE_STRACE
 
 	  https://strace.io
 
-comment "strace needs a toolchain w/ headers >= 5.0 on xtensa"
-	depends on BR2_xtensa
-	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0
-
-comment "strace needs a musl toolchain w/ headers >= 5.0 on aarch64"
-	depends on BR2_aarch64 || BR2_aarch64_be
-	depends on BR2_TOOLCHAIN_USES_MUSL
-	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0
+comment "strace needs a toolchain w/ headers >= 5.1"
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 package/strace: bump version to 7.1

https://github.com/strace/strace/releases/tag/v7.1

Switched to sha256 tarball hash provided by upstream.

---
Gitlab pipelines passed:
https://gitlab.com/bkuhls/buildroot/-/commits/f76e1ae64d9004f060d6ebd7f2c4a4db75c08fc0

 package/strace/strace.hash | 7 +++----
 package/strace/strace.mk   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
package/strace/strace.hash +3 -4
index ad164dfa5c..8df107c948 100644
@@ -1,6 +1,5 @@
-# Locally calculated after checking signature with RSA key from
-# https://raw.githubusercontent.com/strace/strace/refs/tags/v7.0/GPG-KEY
-# https://strace.io/files/7.0/strace-7.0.tar.xz.asc
-sha256  6c92419be3f2ec560b31728a4652217c59864c8642ba7b1b3771b1b013ad074b  strace-7.0.tar.xz
+# From https://github.com/strace/strace/releases/tag/v7.1
+sha256  81743ecf2a5b44186b2f5038afdc8beda7e5c70aed15b4fbfbcc6e9ece24490f  strace-7.1.tar.xz
+# Locally computed
 sha256  b897cf6bb865cdd72f49fba6ca7b66ad075b9bc51d3cf372923220ce18b5350f  COPYING
 sha256  7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa  LGPL-2.1-or-later
package/strace/strace.mk +1 -1
index 5f39bba1bd..a0688939ca 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-STRACE_VERSION = 7.0
+STRACE_VERSION = 7.1
 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
 STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION)
 STRACE_LICENSE = LGPL-2.1+
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Bernd Kuhls
Quoted 15 lines · Bernd Kuhls

Buildroot commit aa5e3eec6384cb73d902a4de3fffc279683ea5a5 bumped the package to version 7.0 which includes commit
https://github.com/strace/strace/commit/33b950714a966bde816a1f1e75c127c3d3ae53cd
that adds an include of linux/time_types.h.

This header file was added in linux kernel version 5.1:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ca5e9aba753ed15d173c7a7b88e4d402b7ca8121

Fixes build errors:

In file included from ../bundled/linux/include/uapi/linux/cgroupstats.h:20:0,
from netlink_nlctrl.c:11:
../bundled/linux/include/uapi/linux/taskstats.h:21:30: fatal error:
linux/time_types.h: No such file or directory

Quoted 5 lines

detected by the Gitlab pipelines with the following defconfigs:
- br-arm-full-static
- bootlin-aarch64-glibc-old

Series applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot