Skip to content

Commit c03ee39

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 1c15689 commit c03ee39

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

scripts/sync-kernel-expected-diff.patch

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
libbpf
2222
--- src/Makefile
2323
+++ src/Makefile
24-
@@ -1,10 +1,8 @@
24+
@@ -1,13 +1,11 @@
2525
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2626
-include ../../scripts/Makefile.include
2727
+include Makefile.include
@@ -32,17 +32,12 @@
3232
-srctree := $(patsubst %/,%,$(dir $(srctree)))
3333
endif
3434

35-
ifeq ($(V),1)
36-
@@ -13,7 +11,7 @@
37-
Q = @
38-
endif
39-
4035
-BPF_DIR = $(srctree)/tools/lib/bpf
4136
+BPF_DIR = $(srctree)/libbpf/src
4237

4338
ifneq ($(OUTPUT),)
4439
_OUTPUT := $(OUTPUT)
45-
@@ -43,16 +41,16 @@
40+
@@ -37,16 +35,16 @@
4641
$(QUIET_MKDIR)mkdir -p $@
4742

4843
$(LIBBPF): $(wildcard $(BPF_DIR)/*.[ch] $(BPF_DIR)/Makefile) | $(LIBBPF_OUTPUT)
@@ -63,7 +58,7 @@
6358
ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" $@ install_headers
6459

6560
$(LIBBPF_BOOTSTRAP_INTERNAL_HDRS): $(LIBBPF_BOOTSTRAP_HDRS_DIR)/%.h: $(BPF_DIR)/%.h | $(LIBBPF_BOOTSTRAP_HDRS_DIR)
66-
@@ -76,9 +74,9 @@
61+
@@ -75,9 +73,9 @@
6762
CFLAGS += -DPACKAGE='"bpftool"' -D__EXPORTED_HEADERS__ \
6863
-I$(or $(OUTPUT),.) \
6964
-I$(LIBBPF_INCLUDE) \
@@ -89,7 +84,7 @@
8984
endif
9085

9186
LIBS = $(LIBBPF) -lelf -lz
92-
@@ -214,7 +208,7 @@
87+
@@ -225,7 +219,7 @@
9388
$(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUTPUT)vmlinux.h $(LIBBPF_BOOTSTRAP)
9489
$(QUIET_CLANG)$(CLANG) \
9590
-I$(or $(OUTPUT),.) \
@@ -98,7 +93,7 @@
9893
-I$(LIBBPF_BOOTSTRAP_INCLUDE) \
9994
-g -O2 -Wall -fno-stack-protector \
10095
--target=bpf -c $< -o $@
101-
@@ -232,7 +226,7 @@
96+
@@ -243,7 +237,7 @@
10297

10398
CFLAGS += $(if $(BUILD_BPF_SKELS),,-DBPFTOOL_WITHOUT_SKELETONS)
10499

@@ -107,7 +102,7 @@
107102
$(QUIET_CC)$(CC) $(CFLAGS) -c -MMD $< -o $@
108103

109104
$(BPFTOOL_BOOTSTRAP): $(BOOTSTRAP_OBJS) $(LIBBPF_BOOTSTRAP)
110-
@@ -251,7 +245,7 @@
105+
@@ -262,7 +256,7 @@
111106
$(call QUIET_CLEAN, feature-detect)
112107
$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
113108

@@ -116,7 +111,7 @@
116111
$(call QUIET_CLEAN, bpftool)
117112
$(Q)$(RM) -- $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d
118113
$(Q)$(RM) -- $(OUTPUT)*.skel.h $(OUTPUT)vmlinux.h
119-
@@ -267,7 +261,7 @@
114+
@@ -278,7 +272,7 @@
120115

121116
install: install-bin
122117
$(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir)
@@ -125,7 +120,7 @@
125120

126121
uninstall:
127122
$(call QUIET_UNINST, bpftool)
128-
@@ -275,16 +269,16 @@
123+
@@ -286,16 +280,16 @@
129124
$(Q)$(RM) -- $(DESTDIR)$(bash_compdir)/bpftool
130125

131126
doc:

0 commit comments

Comments
 (0)