release 6.15.8

debian/rules.d/tools/bpf/bpftool/Makefile

@@ -1,23 +1,15 @@
 include $(top_rulesdir)/Makefile.inc
 
-MAKE_BPFTOOL := +$(MAKE) -C $(top_srcdir)/$(OUTDIR) O=$(CURDIR)
-MAKE_BPFTOOL += prefix=/usr
-MAKE_BPFTOOL += mandir=/usr/share/man
-MAKE_BPFTOOL += V=1
-MAKE_BPFTOOL += ARCH=$(KERNEL_ARCH)
-MAKE_BPFTOOL += EXTRA_CFLAGS='$(CFLAGS) $(CPPFLAGS)'
-MAKE_BPFTOOL += EXTRA_LDFLAGS='$(LDFLAGS)'
-
 # dynamically linking with libbfd is not allowed in Debian
-MAKE_BPFTOOL += feature-libbfd=0 feature-libbfd-liberty=0 feature-libbfd-liberty-z=0
+MAKE_UPSTREAM += feature-libbfd=0 feature-libbfd-liberty=0 feature-libbfd-liberty-z=0
 
 all:
-	$(MAKE_BPFTOOL)
-	$(MAKE_BPFTOOL) doc
+	$(MAKE_UPSTREAM)
+	$(MAKE_UPSTREAM) doc
 # Check that bpftool wasn't linked with libbfd
 	type ldd
 	! ldd $(CURDIR)/bpftool | grep -E '\blibbfd'
 
 install:
-	$(MAKE_BPFTOOL) install
-	$(MAKE_BPFTOOL) doc-install
+	$(MAKE_UPSTREAM) install
+	$(MAKE_UPSTREAM) doc-install