Makefile: run go generate on all packages

We used to not run go generate on all packages to avoid a default dependency on stringer. Now that the builder image has stringer by default it's easier to just generate all packages.
cilium · Oct 27, 2022 · af0f85a · af0f85a
1 parent d04df05
commit af0f85a
Show file tree

Hide file tree

Showing 30 changed files with 29 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -77,9 +77,7 @@ all: format $(addsuffix -el.elf,$(TARGETS)) $(addsuffix -eb.elf,$(TARGETS)) gene
 generate: export BPF_CLANG := $(CLANG)
 generate: export BPF_CFLAGS := $(CFLAGS)
 generate:
-	go generate ./cmd/bpf2go/test
-	go generate ./internal/sys
-	go generate ./examples/...
+	go generate ./...
 
 testdata/loader-%-el.elf: testdata/loader.c
 	$* $(CFLAGS) -target bpfel -c $< -o $@

diff --git a/btf/btf_types_string.go b/btf/btf_types_string.go
diff --git a/cmd/bpf2go/test/test_bpfeb.go b/cmd/bpf2go/test/test_bpfeb.go
diff --git a/cmd/bpf2go/test/test_bpfel.go b/cmd/bpf2go/test/test_bpfel.go
diff --git a/examples/cgroup_skb/bpf_bpfeb.go b/examples/cgroup_skb/bpf_bpfeb.go
diff --git a/examples/cgroup_skb/bpf_bpfel.go b/examples/cgroup_skb/bpf_bpfel.go
diff --git a/examples/fentry/bpf_bpfeb.go b/examples/fentry/bpf_bpfeb.go
diff --git a/examples/fentry/bpf_bpfel.go b/examples/fentry/bpf_bpfel.go
diff --git a/examples/kprobe/bpf_bpfeb.go b/examples/kprobe/bpf_bpfeb.go
diff --git a/examples/kprobe/bpf_bpfel.go b/examples/kprobe/bpf_bpfel.go
diff --git a/examples/kprobe_percpu/bpf_bpfeb.go b/examples/kprobe_percpu/bpf_bpfeb.go
diff --git a/examples/kprobe_percpu/bpf_bpfel.go b/examples/kprobe_percpu/bpf_bpfel.go
diff --git a/examples/kprobepin/bpf_bpfeb.go b/examples/kprobepin/bpf_bpfeb.go
diff --git a/examples/kprobepin/bpf_bpfel.go b/examples/kprobepin/bpf_bpfel.go
diff --git a/examples/ringbuffer/bpf_bpfeb.go b/examples/ringbuffer/bpf_bpfeb.go
diff --git a/examples/ringbuffer/bpf_bpfel.go b/examples/ringbuffer/bpf_bpfel.go
diff --git a/examples/tcprtt/bpf_bpfeb.go b/examples/tcprtt/bpf_bpfeb.go
diff --git a/examples/tcprtt/bpf_bpfel.go b/examples/tcprtt/bpf_bpfel.go
diff --git a/examples/tcprtt_sockops/bpf_bpfeb.go b/examples/tcprtt_sockops/bpf_bpfeb.go
diff --git a/examples/tcprtt_sockops/bpf_bpfel.go b/examples/tcprtt_sockops/bpf_bpfel.go
diff --git a/examples/tracepoint_in_c/bpf_bpfeb.go b/examples/tracepoint_in_c/bpf_bpfeb.go
diff --git a/examples/tracepoint_in_c/bpf_bpfel.go b/examples/tracepoint_in_c/bpf_bpfel.go
diff --git a/examples/uretprobe/bpf_bpfel_x86.go b/examples/uretprobe/bpf_bpfel_x86.go
diff --git a/examples/xdp/bpf_bpfeb.go b/examples/xdp/bpf_bpfeb.go
diff --git a/examples/xdp/bpf_bpfel.go b/examples/xdp/bpf_bpfel.go
diff --git a/testdata/loader-clang-14-eb.elf b/testdata/loader-clang-14-eb.elf
diff --git a/testdata/loader-clang-14-el.elf b/testdata/loader-clang-14-el.elf
diff --git a/testdata/loader-clang-9-eb.elf b/testdata/loader-clang-9-eb.elf
diff --git a/testdata/loader-clang-9-el.elf b/testdata/loader-clang-9-el.elf
diff --git a/testdata/loader.c b/testdata/loader.c
@@ -181,7 +181,9 @@ __section("socket/4") int anon_const() {
 
 // 32 bytes wide results in a .rodata.cst32 section.
 #define values \
-	(uint64_t[]) { 0x0, 0x1, 0x2, 0x3 }
+	(uint64_t[]) { \
+		0x0, 0x1, 0x2, 0x3 \
+	}
 
 	int i;
 	for (i = 0; i < 3; i++) {