diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:27:18 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:27:22 +0000 |
| commit | 23d8021784056b7cd2b1a53d59406fc223d936a2 (patch) | |
| tree | b3fdefceda87c003da89216c1f36b295cd01a9f0 /debian/rules.d/tools | |
| parent | Merging upstream version 6.10.3. (diff) | |
| download | linux-23d8021784056b7cd2b1a53d59406fc223d936a2.tar.xz linux-23d8021784056b7cd2b1a53d59406fc223d936a2.zip | |
Merging debian version 6.10.3-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/rules.d/tools')
| -rw-r--r-- | debian/rules.d/tools/hv/Makefile | 1 | ||||
| -rw-r--r-- | debian/rules.d/tools/perf/Makefile | 7 | ||||
| -rw-r--r-- | debian/rules.d/tools/power/x86/turbostat/Makefile | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/debian/rules.d/tools/hv/Makefile b/debian/rules.d/tools/hv/Makefile index 5f00f55136..8e4c3052b6 100644 --- a/debian/rules.d/tools/hv/Makefile +++ b/debian/rules.d/tools/hv/Makefile @@ -6,7 +6,6 @@ include $(top_rulesdir)/Makefile.inc else PROGS = \ - hv_fcopy_daemon \ hv_kvp_daemon \ hv_vss_daemon diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile index b81116ab17..30093d5203 100644 --- a/debian/rules.d/tools/perf/Makefile +++ b/debian/rules.d/tools/perf/Makefile @@ -10,11 +10,6 @@ MAKE_PERF += feature-jvmti=0 MAKE_PERF += perfexecdir=lib/perf-core plugindir=/usr/lib/traceevent/plugins tipdir=share/doc/linux-perf perf_include_dir=include/perf perf_examples_dir=share/doc/linux-perf/examples -# perf can link against libdebuginfod if available, but the result is -# undistributable for the same reason. Override detection of -# libdebuginfod. -MAKE_PERF += NO_LIBDEBUGINFOD=1 - # perf can link against libcrypto if available, but the result is # undistributable as GPL v2 and Apache 2.0 are not compatible without # an explicit exception. Override detection of libcrypto. @@ -50,7 +45,7 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) +$(MAKE_PERF) -C $(top_srcdir)/tools/perf/Documentation man endif # Check that perf didn't get linked against incompatibly-licensed libraries - @if readelf -d $(CURDIR)/perf | sed -rne 's/.*NEEDED.*\[(.*)\]/\1/p' | grep -E '\blib(bfd|crypto|debuginfod)'; then \ + @if readelf -d $(CURDIR)/perf | sed -rne 's/.*NEEDED.*\[(.*)\]/\1/p' | grep -E '\blib(bfd|crypto)'; then \ echo; \ echo 'perf linked against incompatibly-licensed libraries'; \ echo; \ diff --git a/debian/rules.d/tools/power/x86/turbostat/Makefile b/debian/rules.d/tools/power/x86/turbostat/Makefile index eb5124d3a5..9f5275c580 100644 --- a/debian/rules.d/tools/power/x86/turbostat/Makefile +++ b/debian/rules.d/tools/power/x86/turbostat/Makefile @@ -4,6 +4,6 @@ installdir = /usr/sbin include $(top_rulesdir)/Makefile.inc -CPPFLAGS += -I"$(top_srcdir)/tools/include" -DMSRHEADER='"$(top_srcdir)/arch/x86/include/asm/msr-index.h"' -DINTEL_FAMILY_HEADER='"$(top_srcdir)/arch/x86/include/asm/intel-family.h"' +CPPFLAGS += -I"$(top_srcdir)/tools/include" -DMSRHEADER='"$(top_srcdir)/arch/x86/include/asm/msr-index.h"' -DINTEL_FAMILY_HEADER='"$(top_srcdir)/arch/x86/include/asm/intel-family.h"' -DBUILD_BUG_HEADER='"$(top_srcdir)/include/linux/build_bug.h"' LDLIBS += -lcap -lrt |