From patchwork Fri Jul 5 22:45:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 810639 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 924A3144D11 for ; Fri, 5 Jul 2024 22:45:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720219546; cv=none; b=qdUpyINXZOENrVWGUw6KpKEeg6p36Uc/rK/98xMGzgNlHUb6+2L1dCtM/cQgQ7lEqd1t9qQy3qJ/c2W+2LhCc5eaiYvfgI2jbp5pZo+bfsL/fCT3FML2eMwVjnzWNvSz/CxiLDCA61iTb65D/bCqmCgbt6XF3ZwbquF/p8MQiXg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720219546; c=relaxed/simple; bh=J2u1qHCiKCA3RfsyCI2pggoYFpbeaiFVXegTV/9f4hI=; h=Content-Type:Message-ID:Date:MIME-Version:To:Cc:From:Subject; b=UFGTjPJlL6RrzxKqTqmRE0If7gL88qN8lghb/Kw5A6iMj6CoQdCgXdntotsLZ1Bte0oGFv777XrhVJdQza0nx/WEwysOBsOXKmIbR+rB9HmMMFUaE5hn+sXawYoY2YWBCqRlpauKBU+5vEnrayVRoHZ9fqU0VuASDgrp64Ay25Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org; spf=pass smtp.mailfrom=linuxfoundation.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OLFzEhrT; arc=none smtp.client-ip=209.85.166.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OLFzEhrT" Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-7f70a7470d3so300239f.0 for ; Fri, 05 Jul 2024 15:45:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1720219540; x=1720824340; darn=vger.kernel.org; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=XPMYfJWmf3WNCz84K05Te7W0yqGn9oyU7AN35KIwYek=; b=OLFzEhrTE6L9HUJZfU0NgoXaZ9Pa7O0tEZjN/ttgVEdvpijgDuFM3euIpEprE/+m02 9f8B5CZX6iHygVjZMPKV9xYCHcK9JGZR/9K7ohuO2cg4ZKICOzQKp7lUwMN66cFxNhiD gTJjqntesu7eGpm69lU1JrEaz+hoaobehuy+c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720219540; x=1720824340; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XPMYfJWmf3WNCz84K05Te7W0yqGn9oyU7AN35KIwYek=; b=Fwg+Gbpu695W/Lh5i3toewpmU210a5nFkl0DuKbTZRy8w6cU0Az6q9jSg++pdjRxUo AW9wKNZ30akCYd+S4/mqV5xA7WSQFe6UhNIoxN7uvr/GS9jlxNVUQwxzAsR1ucGE6XOb 3hWryPgByfUKLO7L9u0L3dKSIS/VLeFWp6W+dl+2TLIJECOiL3Jp0cKduusT+8hLsN88 9nU+7ClMy+juwQcLhPzawinClKNrhkqlLtxSsvFYsO/4J6Q3LD+zJZfGDcxmnMh8Au8W QldCDf0wsn835g/aEn2tM4UeYfuCQdrUL/IRCUta7q3/h4qGn44huhaPlmChFs6+MWwT jDgw== X-Forwarded-Encrypted: i=1; AJvYcCXP24yhX0mjxtOqKvLagyqEKgE51sud64wFjYO/2oidVoTl1vqIbjecAPltEIZgD4gQmm5uLMu6oSSDRGmSyWKN8izIi2J6R/I= X-Gm-Message-State: AOJu0YyHniIPu0rQk0MkS8LTYAX5t60M4cS9B0zL3bP25Z1OBN8VuUL3 su4TyWFDOmEet6vzJoQYVqEbtkiXo1uT+TJ33yI7NjpF7k9CWwRBwNfFkoCf+f4= X-Google-Smtp-Source: AGHT+IFiOtWsyaxb1z0ZzXLScuB6n4UhuXRTJth4ktjjKG0Ac43ITwVD9tXgNdHw5GjyVxL8f3BU/A== X-Received: by 2002:a05:6602:6183:b0:7f8:bfcd:db3e with SMTP id ca18e2360f4ac-7f8bfcddd04mr3425139f.0.1720219540586; Fri, 05 Jul 2024 15:45:40 -0700 (PDT) Received: from [192.168.1.128] ([38.175.170.29]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4bb73bb374dsm4604825173.36.2024.07.05.15.45.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Jul 2024 15:45:39 -0700 (PDT) Message-ID: <00aaf29c-e638-4161-90fa-49eff270598e@linuxfoundation.org> Date: Fri, 5 Jul 2024 16:45:39 -0600 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "Rafael J. Wysocki" Cc: Thomas Renninger , Shuah Khan , shuah , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org From: Shuah Khan Subject: [GIT PULL] cpupower second update for Linux 6.11-rc1 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(-) ---------------------------------------------------------------- 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),)