From 7bad6b077bd46f61f574cb427b290146d961cba7 Mon Sep 17 00:00:00 2001 From: Casey Callendrello Date: Fri, 21 Jul 2023 13:25:52 +0200 Subject: [PATCH] build: dont make -C bpf when building container images We used to skip bpf builds by setting PKG_BUILD=1 deep in the docker build rules, but that check was removed. That variable is undocumented and obscure anyways, so let's not bring it back. Rather, don't set bpf for building when making container images, just when doing a top-level "make build". Signed-off-by: Casey Callendrello --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 186de22764d4a..0e782994f33cf 100644 --- a/Makefile +++ b/Makefile @@ -12,13 +12,13 @@ debug: all include Makefile.defs -SUBDIRS_CILIUM_CONTAINER := envoy bpf cilium daemon cilium-health bugtool tools/mount tools/sysctlfix +SUBDIRS_CILIUM_CONTAINER := envoy cilium daemon cilium-health bugtool tools/mount tools/sysctlfix SUBDIR_OPERATOR_CONTAINER := operator # Add the ability to override variables -include Makefile.override -SUBDIRS := $(SUBDIRS_CILIUM_CONTAINER) $(SUBDIR_OPERATOR_CONTAINER) plugins tools hubble-relay +SUBDIRS := $(SUBDIRS_CILIUM_CONTAINER) $(SUBDIR_OPERATOR_CONTAINER) plugins tools hubble-relay bpf SUBDIRS_CILIUM_CONTAINER += plugins/cilium-cni ifdef LIBNETWORK_PLUGIN