mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
513f800cf3
Buildroot commit97e2f63bdfbumped bpftrace from 0.23.3 to 0.24.2. This release includes upstream commit7578314df6which was added to version 0.24.0 and makes use of bpf_iter_link_info.task that was added to the linux kernel in version 6.1:f0d74c4da1causing build errors when the toolchain contains kernel headers version 6.0 because the libbpf package does not update their headers: output/build/bpftrace-0.24.2/src/attached_probe.cpp: In static member function 'static bpftrace::Result<std::unique_ptr<bpftrace::AttachedIterProbe> > bpftrace::AttachedIterProbe::make(bpftrace::Probe&, const bpftrace::BpfProgram&, std::optional<int>)': output/build/bpftrace-0.24.2/src/attached_probe.cpp:1437:11: error: 'union bpf_iter_link_info' has no member named 'task' 1437 | linfo.task.pid = *pid; The build error can be reproduced with this defconfig BR2_aarch64=y BR2_KERNEL_HEADERS_VERSION=y BR2_DEFAULT_KERNEL_VERSION="6.0.19" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PER_PACKAGE_DIRECTORIES=y BR2_PACKAGE_BPFTRACE=y on the 2026.02.x branch as of0be927b89a. Fixes: https://autobuild.buildroot.net/results/146/14671c54fdf0a2e44bcce7ff61ca9b89a925eca9/ Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
55 lines
2.0 KiB
Makefile
55 lines
2.0 KiB
Makefile
################################################################################
|
|
#
|
|
# libbpf
|
|
#
|
|
################################################################################
|
|
|
|
LIBBPF_VERSION = 1.6.2
|
|
LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION))
|
|
LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause
|
|
LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1
|
|
LIBBPF_CPE_ID_VALID = YES
|
|
LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib
|
|
HOST_LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf host-elfutils host-zlib
|
|
LIBBPF_INSTALL_STAGING = YES
|
|
|
|
define LIBBPF_BUILD_CMDS
|
|
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
|
|
-C $(@D)/src
|
|
endef
|
|
|
|
# bpftrace uses bpf_iter_link_info.task that was added since kernel 6.1
|
|
# so we need to update some uapi headers in STAGING_DIR if the toolchain
|
|
# is build with linux-headers < 6.1.
|
|
# Otherwise bpftrace is broken due to out of date linux/bpf.h installed
|
|
# by the toolchain.
|
|
# https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f0d74c4da1f060d2a66976193712a5e6abd361f5
|
|
# https://github.com/bpftrace/bpftrace/commit/7578314df67df6bbdffaf493ff3b4d182b235b34
|
|
ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1),)
|
|
LIBBPF_UPDATE_UAPI_HEADERS = install_uapi_headers UAPIDIR=/usr/include/bpf
|
|
|
|
define LIBBPF_FIX_STAGING_PC
|
|
$(SED) 's/-I$${includedir}/-I$${includedir}\/bpf -I$${includedir}/' $(STAGING_DIR)/usr/lib/pkgconfig/libbpf.pc
|
|
endef
|
|
LIBBPF_POST_INSTALL_STAGING_HOOKS += LIBBPF_FIX_STAGING_PC
|
|
endif
|
|
|
|
define LIBBPF_INSTALL_STAGING_CMDS
|
|
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
|
|
-C $(@D)/src install $(LIBBPF_UPDATE_UAPI_HEADERS) \
|
|
DESTDIR=$(STAGING_DIR)
|
|
endef
|
|
|
|
define LIBBPF_INSTALL_TARGET_CMDS
|
|
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
|
|
-C $(@D)/src install DESTDIR=$(TARGET_DIR)
|
|
endef
|
|
|
|
define HOST_LIBBPF_INSTALL_CMDS
|
|
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
|
|
-C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR)
|
|
endef
|
|
|
|
$(eval $(generic-package))
|
|
$(eval $(host-generic-package))
|