release 6.15.8

debian/rules.d/tools/power/cpupower/Makefile

@@ -1,21 +1,11 @@
 include $(top_rulesdir)/Makefile.inc
 
-MAKE_CPUPOWER := CFLAGS='$(CFLAGS) $(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(MAKE) -C $(top_srcdir)/tools/power/cpupower O=$(CURDIR) CPUFREQ_BENCH=false V=true mandir=/usr/share/man
-
-MAKE_CPUPOWER += DEBUG=$(if $(filter noopt,$(DEB_BUILD_OPTIONS)),true,)
-
-# Don't strip binaries here; let dh_strip determine what to do
-MAKE_CPUPOWER += STRIP=true
-
-MAKE_CPUPOWER += CROSS='$(CROSS_COMPILE)'
-
-MAKE_CPUPOWER += libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+MAKE_UPSTREAM += CPUFREQ_BENCH=false V=true
+MAKE_UPSTREAM += DEBUG=$(if $(filter noopt,$(DEB_BUILD_OPTIONS)),true,)
+MAKE_UPSTREAM += CROSS='$(CROSS_COMPILE)'
 
 all:
-	+$(MAKE_CPUPOWER)
+	$(MAKE_UPSTREAM)
 
 install:
-	+$(MAKE_CPUPOWER) install DESTDIR=$(DESTDIR)
-
-clean:
-	+$(MAKE_CPUPOWER) clean
+	$(MAKE_UPSTREAM) install

debian/rules.d/tools/power/x86/intel-speed-select/Makefile

@@ -1,15 +1,9 @@
 include $(top_rulesdir)/Makefile.inc
 
-# Intel Speed Select Tool (ISST)
-MAKE_ISST := CFLAGS='$(CFLAGS) $(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(MAKE) -C $(top_srcdir)/tools/power/x86/intel-speed-select O=$(CURDIR)
-
-MAKE_ISST += bindir=/usr/sbin V=1
+bindir := /usr/sbin
 
 all:
-	$(MAKE_ISST)
+	$(MAKE_UPSTREAM)
 
 install:
-	$(MAKE_ISST) install DESTDIR=$(DESTDIR)
-
-clean:
-	$(MAKE_ISST) clean
+	$(MAKE_UPSTREAM) install

debian/rules.d/tools/power/x86/turbostat/Makefile

@@ -4,9 +4,5 @@ installdir = /usr/sbin
 
 include $(top_rulesdir)/Makefile.inc
 
-CPPFLAGS += -I$(top_srcdir)/tools/include
-CPPFLAGS += -DMSRHEADER='"$(top_srcdir)/arch/x86/include/asm/msr-index.h"'
-CPPFLAGS += -DINTEL_FAMILY_HEADER='"$(top_srcdir)/arch/x86/include/asm/intel-family.h"'
-CPPFLAGS += -DBUILD_BUG_HEADER='"$(top_srcdir)/include/linux/build_bug.h"'
-
-LDLIBS += -lcap -lrt
+$(PROGS):
+	$(MAKE_UPSTREAM)

debian/rules.d/tools/power/x86/x86_energy_perf_policy/Makefile

@@ -4,5 +4,5 @@ installdir = /usr/sbin
 
 include $(top_rulesdir)/Makefile.inc
 
-CPPFLAGS += -I$(top_srcdir)/tools/include
-CPPFLAGS += -DMSRHEADER='"$(top_srcdir)/arch/x86/include/asm/msr-index.h"'
+$(PROGS):
+	$(MAKE_UPSTREAM)