From e01624c730ca6dc0ba7dbd7e238f797c626537e5 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 27 Dec 2017 00:53:34 +0000 Subject: [PATCH] cpupower: Move library to multiarch directory Upstream moved it from /usr/lib to /usr/lib64 in 4.15, but neither of these is correct. --- debian/changelog | 1 + debian/libcpupower-dev.install | 2 +- debian/libcpupower1.install | 2 +- debian/rules.d/tools/power/cpupower/Makefile | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce8c9b5d1..743c20aa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ linux (4.15~rc5-1~exp1) UNRELEASED; urgency=medium * lockdown: Update patchset to 2017-11-10 version * lockdown: Update calls to kernel_is_locked_down() in "mtd: Disable slram and phram when locked down" + * cpupower: Move library to multiarch directory -- Ben Hutchings Tue, 26 Dec 2017 16:25:55 +0000 diff --git a/debian/libcpupower-dev.install b/debian/libcpupower-dev.install index b34190552..f3800aad5 100644 --- a/debian/libcpupower-dev.install +++ b/debian/libcpupower-dev.install @@ -1,2 +1,2 @@ usr/include/* -usr/lib/lib*.so +usr/lib/*/lib*.so diff --git a/debian/libcpupower1.install b/debian/libcpupower1.install index d0dbfd18a..3ddde5841 100644 --- a/debian/libcpupower1.install +++ b/debian/libcpupower1.install @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff --git a/debian/rules.d/tools/power/cpupower/Makefile b/debian/rules.d/tools/power/cpupower/Makefile index 23193b5b3..d83393906 100644 --- a/debian/rules.d/tools/power/cpupower/Makefile +++ b/debian/rules.d/tools/power/cpupower/Makefile @@ -8,6 +8,8 @@ MAKE_CPUPOWER += CROSS='$(CROSS_COMPILE)' MAKE_CPUPOWER += PACKAGE_BUGREPORT='Debian\ \(reportbug\ linux-cpupower\)' +MAKE_CPUPOWER += libdir=/usr/lib/$(DEB_HOST_MULTIARCH) + all: $(MAKE_CPUPOWER) -C $(top_srcdir)/tools/power/cpupower