Skip to content

Commit 20ce693

Browse files
committed
mirror: Update expected diff with kernel sources
A recent patch has touched some portions of bpftool's Makefile that differ between kernel's and mirror's sources. Let's update the diff with the expected differences accordingly, to smoothen future sync ups. Signed-off-by: Quentin Monnet <[email protected]>
1 parent a668a13 commit 20ce693

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

scripts/sync-kernel-expected-diff.patch

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
ifneq ($(BPFTOOL_VERSION),)
7777
CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"'
7878
endif
79-
@@ -119,11 +117,7 @@
79+
@@ -123,11 +121,7 @@
8080
endif
8181

8282
ifeq ($(check_feat),1)
@@ -89,29 +89,25 @@
8989
endif
9090

9191
LIBS = $(LIBBPF) -lelf -lz
92-
@@ -213,7 +207,7 @@
92+
@@ -214,7 +208,7 @@
9393
$(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUTPUT)vmlinux.h $(LIBBPF_BOOTSTRAP)
9494
$(QUIET_CLANG)$(CLANG) \
9595
-I$(or $(OUTPUT),.) \
9696
- -I$(srctree)/tools/include/uapi/ \
9797
+ -I$(srctree)/include/uapi/ \
9898
-I$(LIBBPF_BOOTSTRAP_INCLUDE) \
9999
-g -O2 -Wall -fno-stack-protector \
100-
-target bpf -c $< -o $@
101-
@@ -231,10 +225,10 @@
100+
--target=bpf -c $< -o $@
101+
@@ -232,7 +226,7 @@
102102

103103
CFLAGS += $(if $(BUILD_BPF_SKELS),,-DBPFTOOL_WITHOUT_SKELETONS)
104104

105-
-$(BOOTSTRAP_OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
106-
+$(BOOTSTRAP_OUTPUT)disasm.o: $(srctree)/src/kernel/bpf/disasm.c
107-
$(QUIET_CC)$(HOSTCC) $(HOST_CFLAGS) -c -MMD $< -o $@
108-
109105
-$(OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
110106
+$(OUTPUT)disasm.o: $(srctree)/src/kernel/bpf/disasm.c
111107
$(QUIET_CC)$(CC) $(CFLAGS) -c -MMD $< -o $@
112108

113109
$(BPFTOOL_BOOTSTRAP): $(BOOTSTRAP_OBJS) $(LIBBPF_BOOTSTRAP)
114-
@@ -253,7 +247,7 @@
110+
@@ -251,7 +245,7 @@
115111
$(call QUIET_CLEAN, feature-detect)
116112
$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
117113

@@ -120,7 +116,7 @@
120116
$(call QUIET_CLEAN, bpftool)
121117
$(Q)$(RM) -- $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d
122118
$(Q)$(RM) -- $(OUTPUT)*.skel.h $(OUTPUT)vmlinux.h
123-
@@ -269,7 +263,7 @@
119+
@@ -267,7 +261,7 @@
124120

125121
install: install-bin
126122
$(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir)
@@ -129,7 +125,7 @@
129125

130126
uninstall:
131127
$(call QUIET_UNINST, bpftool)
132-
@@ -277,16 +271,16 @@
128+
@@ -275,16 +269,16 @@
133129
$(Q)$(RM) -- $(DESTDIR)$(bash_compdir)/bpftool
134130

135131
doc:

0 commit comments

Comments
 (0)