Skip to content

Commit

Permalink
Merge pull request #321 from Knogle/fix-action-ebpf-arch-mismatch
Browse files Browse the repository at this point in the history 
linux-tools: remove BPF kselftest artifact to avoid arch mismatch error
  • Loading branch information
@PartialVolume
PartialVolume authored Jan 24, 2025
2 parents 4fcdcef + 6a254b3 commit 4bda8c2
Showing 1 changed file with 47 additions and 40 deletions.
87 changes: 47 additions & 40 deletions package/linux-tools/linux-tools.mk
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
################################################################################
#
# linux-tools
#
################################################################################

# Vampirising sources from the kernel tree, so no source nor site specified.
# Instead, we directly build in the sources of the linux package. We can do
# that, because we're not building in the same location and the same files.
#
# So, all tools refer to $(LINUX_DIR) instead of $(@D).

# Note: we need individual tools makefiles to be included *before* we build
# the list of build and install hooks below to guarantee that each tool has
# a chance to register itself once, and only once. Therefore, the makefiles
# are named linux-tool-*.mk.in, so they won't be picked up by the top-level
# Makefile, but can be included here, guaranteeing the single inclusion and
# the proper ordering.
Expand All @@ -27,48 +12,70 @@ LINUX_TOOLS_PATCH_DEPENDENCIES = linux
LINUX_TOOLS_INSTALL_STAGING = YES

LINUX_TOOLS_DEPENDENCIES += $(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$($(call UPPERCASE,$(tool))_DEPENDENCIES)))
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$($(call UPPERCASE,$(tool))_DEPENDENCIES)))

LINUX_TOOLS_POST_BUILD_HOOKS += $(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$(call UPPERCASE,$(tool))_BUILD_CMDS))
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$(call UPPERCASE,$(tool))_BUILD_CMDS))

LINUX_TOOLS_POST_INSTALL_STAGING_HOOKS += $(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$(call UPPERCASE,$(tool))_INSTALL_STAGING_CMDS))
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$(call UPPERCASE,$(tool))_INSTALL_STAGING_CMDS))

LINUX_TOOLS_POST_INSTALL_TARGET_HOOKS += $(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$(call UPPERCASE,$(tool))_INSTALL_TARGET_CMDS))
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$(call UPPERCASE,$(tool))_INSTALL_TARGET_CMDS))

#
# Fix up kernel config if needed
#
define LINUX_TOOLS_LINUX_CONFIG_FIXUPS
$(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$($(call UPPERCASE,$(tool))_LINUX_CONFIG_FIXUPS))
)
$(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$($(call UPPERCASE,$(tool))_LINUX_CONFIG_FIXUPS))
)
endef

#
# Systemd, SysV, and OpenRC init installations
#
define LINUX_TOOLS_INSTALL_INIT_SYSTEMD
$(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSTEMD))
)
$(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSTEMD))
)
endef

define LINUX_TOOLS_INSTALL_INIT_SYSV
$(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSV))
)
$(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSV))
)
endef

define LINUX_TOOLS_INSTALL_INIT_OPENRC
$(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$(or $($(call UPPERCASE,$(tool))_INSTALL_INIT_OPENRC),\
$($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSV)))
)
$(foreach tool,$(LINUX_TOOLS),\
$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
$(or $($(call UPPERCASE,$(tool))_INSTALL_INIT_OPENRC),\
$($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSV)))
)
endef

#
# -------------------------------------------------------------------
# Remove the 'action-ebpf' test artifact that triggers an
# "architecture mismatch" error on x86_64. This file is built
# for "Linux BPF" instead of the host architecture, so Buildroot
# complains on the first build.
# -------------------------------------------------------------------
#
define LINUX_TOOLS_REMOVE_BPF_TEST_ARTIFACT
# Only remove if it exists. This is safe even if the file
# doesn't get built or already got cleaned up.
rm -f $(TARGET_DIR)/usr/lib/kselftests/tc-testing/action-ebpf
endef

LINUX_TOOLS_POST_INSTALL_TARGET_HOOKS += LINUX_TOOLS_REMOVE_BPF_TEST_ARTIFACT

$(eval $(generic-package))

0 comments on commit 4bda8c2

Please sign in to comment.