[GIT PULL] cpupower second update for Linux 6.11-rc1

[Shuah Khan <skhan@linuxfoundation.org>]

[-- Attachment #1: Type: text/plain, Size: 1662 bytes --]

Hi Rafael,

Please pull the following cpupower second update for Linux 6.11-rc1.

This cpupower second update for Linux 6.11-rc1 consists of

-- fix to install cpupower library in standard librray intall
    location - /usr/lib
-- disable direct build of cpupower bench as it can only be
    built from the cpupower main makefile.

diff is attached.

thanks,
-- Shuah

----------------------------------------------------------------
The following changes since commit 3e1f12c26646eb0ad67d3eaefd32f765997da6a8:

   cpupower: Change the var type of the 'monitor' subcommand display mode (2024-06-20 10:08:08 -0600)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux tags/linux-cpupower-6.11-rc1-2

for you to fetch changes up to 3a5bb5066f4c7170e850b930e84b1075e25f8e90:

   cpupower: fix lib default installation path (2024-07-02 15:30:32 -0600)

----------------------------------------------------------------
linux-cpupower-6.11-rc1-2

This cpupower second update for Linux 6.11-rc1 consists of

-- fix to install cpupower library in standard librray intall
    location - /usr/lib
-- disable direct build of cpupower bench as it can only be
   built from the cpupower main makefile.

----------------------------------------------------------------
Roman Storozhenko (2):
       cpupower: Disable direct build of the 'bench' subproject
       cpupower: fix lib default installation path

  tools/power/cpupower/Makefile       | 10 +---------
  tools/power/cpupower/bench/Makefile |  5 +++++
  2 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------

[-- Attachment #2: linux-cpupower-6.11-rc1-2.diff --]
[-- Type: text/x-patch, Size: 1171 bytes --]

diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
index cd0225a312b4..6c02f401069e 100644
--- a/tools/power/cpupower/Makefile
+++ b/tools/power/cpupower/Makefile
@@ -67,6 +67,7 @@ LANGUAGES = 			de fr it cs pt ka
 bindir ?=	/usr/bin
 sbindir ?=	/usr/sbin
 mandir ?=	/usr/man
+libdir ?=	/usr/lib
 includedir ?=	/usr/include
 localedir ?=	/usr/share/locale
 docdir ?=       /usr/share/doc/packages/cpupower
@@ -94,15 +95,6 @@ RANLIB = $(CROSS)ranlib
 HOSTCC = gcc
 MKDIR = mkdir
 
-# 64bit library detection
-include ../../scripts/Makefile.arch
-
-ifeq ($(IS_64_BIT), 1)
-libdir ?=	/usr/lib64
-else
-libdir ?=	/usr/lib
-endif
-
 # Now we set up the build system
 #
 
diff --git a/tools/power/cpupower/bench/Makefile b/tools/power/cpupower/bench/Makefile
index a4b902f9e1c4..34e5894476eb 100644
--- a/tools/power/cpupower/bench/Makefile
+++ b/tools/power/cpupower/bench/Makefile
@@ -1,4 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0
+ifeq ($(MAKELEVEL),0)
+$(error This Makefile is not intended to be run standalone, but only as a part \
+of the  main one in the parent dir)
+endif
+
 OUTPUT := ./
 ifeq ("$(origin O)", "command line")
 ifneq ($(O),)