Skip to content

Commit 5730b38

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 <qmo@kernel.org>
1 parent 670405a commit 5730b38

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

scripts/sync-kernel-expected-diff.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
- DESTDIR=$(LIBBPF_BOOTSTRAP_DESTDIR:/=) prefix= \
5656
+ $(Q)$(MAKE) -C $(BPF_DIR) OBJDIR=$(patsubst %/,%,$(LIBBPF_BOOTSTRAP_OUTPUT)) \
5757
+ DESTDIR="" PREFIX=$(LIBBPF_BOOTSTRAP_DESTDIR:/=) \
58-
ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" $@ install_headers
58+
ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" \
59+
CFLAGS="$(LIBBPF_BOOTSTRAP_CFLAGS)" EXTRA_CFLAGS= $@ install_headers
5960

60-
$(LIBBPF_BOOTSTRAP_INTERNAL_HDRS): $(LIBBPF_BOOTSTRAP_HDRS_DIR)/%.h: $(BPF_DIR)/%.h | $(LIBBPF_BOOTSTRAP_HDRS_DIR)
61-
@@ -75,9 +73,9 @@
61+
@@ -76,9 +74,9 @@
6262
CFLAGS += -DPACKAGE='"bpftool"' -D__EXPORTED_HEADERS__ \
6363
-I$(or $(OUTPUT),.) \
6464
-I$(LIBBPF_INCLUDE) \
@@ -71,7 +71,7 @@
7171
ifneq ($(BPFTOOL_VERSION),)
7272
CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"'
7373
endif
74-
@@ -123,11 +121,7 @@
74+
@@ -146,11 +144,7 @@
7575
endif
7676

7777
ifeq ($(check_feat),1)
@@ -83,17 +83,17 @@
8383
+include Makefile.feature
8484
endif
8585

86-
LIBS = $(LIBBPF) -lelf -lz
87-
@@ -225,7 +219,7 @@
88-
$(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUTPUT)vmlinux.h $(LIBBPF_BOOTSTRAP)
89-
$(QUIET_CLANG)$(CLANG) \
86+
LIBS = $(LIBBPF) -lelf $(CRYPTO_LIBS) -lz
87+
@@ -263,7 +257,7 @@
88+
-Wno-microsoft-anon-tag \
89+
-fms-extensions \
9090
-I$(or $(OUTPUT),.) \
9191
- -I$(srctree)/tools/include/uapi/ \
9292
+ -I$(srctree)/include/uapi/ \
9393
-I$(LIBBPF_BOOTSTRAP_INCLUDE) \
9494
-g -O2 -Wall -fno-stack-protector \
9595
--target=bpf -c $< -o $@
96-
@@ -243,7 +237,7 @@
96+
@@ -281,7 +275,7 @@
9797

9898
CFLAGS += $(if $(BUILD_BPF_SKELS),,-DBPFTOOL_WITHOUT_SKELETONS)
9999

@@ -102,7 +102,7 @@
102102
$(QUIET_CC)$(CC) $(CFLAGS) -c -MMD $< -o $@
103103

104104
$(BPFTOOL_BOOTSTRAP): $(BOOTSTRAP_OBJS) $(LIBBPF_BOOTSTRAP)
105-
@@ -262,7 +256,7 @@
105+
@@ -300,7 +294,7 @@
106106
$(call QUIET_CLEAN, feature-detect)
107107
$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
108108

@@ -111,7 +111,7 @@
111111
$(call QUIET_CLEAN, bpftool)
112112
$(Q)$(RM) -- $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d
113113
$(Q)$(RM) -- $(OUTPUT)*.skel.h $(OUTPUT)vmlinux.h
114-
@@ -278,7 +272,7 @@
114+
@@ -316,7 +310,7 @@
115115

116116
install: install-bin
117117
$(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir)
@@ -120,7 +120,7 @@
120120

121121
uninstall:
122122
$(call QUIET_UNINST, bpftool)
123-
@@ -286,16 +280,16 @@
123+
@@ -324,16 +318,16 @@
124124
$(Q)$(RM) -- $(DESTDIR)$(bash_compdir)/bpftool
125125

126126
doc:

0 commit comments

Comments
 (0)