Skip to content

Commit

Permalink
build: dont make -C bpf when building container images
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
squeed authored and ldelossa committed Sep 23, 2023
1 parent d6caa21 commit 7bad6b0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7bad6b0

Please sign in to comment.