From patchwork Tue Jun 10 15:37:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 895468 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (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 F3E38238D51 for ; Tue, 10 Jun 2025 15:37:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749569840; cv=none; b=gcN9cH3DlcaLc9Qqs/xjdS683wFj/R0CWG5N6Xo+gYCC0j3AhWIy/VmIzzCAKsX94JWrOx+S+mZpPTzqNwAyh5HCSnOiMH4ecJAd4i363ISa5HKlZOYBcbr8vGpFIBV8o32oOh2EKz39tCD+6kL3NhCaKJwCxy0iLo5fkOjVhSA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749569840; c=relaxed/simple; bh=Ge1LFO3GJbt9hd5N8cGDfDJg7Ju9ZPGoCT0kFFxY694=; h=Content-Type:Message-ID:Date:MIME-Version:To:Cc:From:Subject; b=Omn/QBg3FbrULXbp/RWOjC+JBUri/EMZnRlSG3PFdA/95VkLHc3Wg6sZTg/oszyZ7dVFxVXLFdmCAyly19S/svaNwO8jCPXnN4rOGkYklXbYb4PyTN0wFK4l1KLDvHeVS5pXHM8MiKGLmrI5ohc9I33pStns+gIjMWeQ1tTXmTU= 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=ON2vEwHa; arc=none smtp.client-ip=209.85.160.179 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="ON2vEwHa" Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-4a5ae2fdf4eso61854661cf.0 for ; Tue, 10 Jun 2025 08:37:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1749569837; x=1750174637; 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=nh+mGpHpRQJpNMq16cUvVk7l1gQB7lXYTYB8ff8wx5k=; b=ON2vEwHa6wpDttnIQUUM1hkDGhGAF48c1oOwgFGzl9uxk8+GxucSGtA0nwumkRqmT3 om+D5offFKK8MGcLDRm+uYK0jqBW0L3Z/ReRxZfP2TNVtSWDrMYU0vlf64Z9Te3LMdti dLiTCVwCofbWAVjI0tJDyNVKoo56oFktIhUFw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749569837; x=1750174637; 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=nh+mGpHpRQJpNMq16cUvVk7l1gQB7lXYTYB8ff8wx5k=; b=LR8CW3WWoxYrRjtHAy3mF+df5HEGT+Rx+4gW4WGTmqW0tMS3HFKbzi8yOtiGCiWRti XXmE3TpqDHx8rBfDMMxypEywb7EAAsM4vz15RKxg+3LxJ5O/vZRoDvZWRyMheyMqxhGN TQQqa0INqK5wuDXzRdtMtQRsmgtej/ReAknRLx5AbYs+iTm5n9VvrihquYfXPD+RHiTT mwX33scrMVY/DqzzmhxF9PrsVKygzGVHfsG0jWJBw9MD5t/j4QnrotfyK+yWg6tEATkJ zuOjq98Kjy78XCr1GluU3/wx8Kcf2HIn2iHTxeWe6/rHtlAnGog5BBoHeRtZx/Nk9FPn 8ZBg== X-Forwarded-Encrypted: i=1; AJvYcCVPe29YB26wnTlxu51Hrp8O+VFNmLoXdpoGFKoi+GY1VEMDyXC5keYWAV6E0TYdD96MhmJUD++aSQ==@vger.kernel.org X-Gm-Message-State: AOJu0YxdtJ/OJ5dRhBrz6uf3TPqzYjEg4rQCwq6/ZoOasqrgEs3rqb/a xzzmkzX6zmgJgYjLRwtglwaEaHj21ryDQZ/4AA6W9pOPCK2Ujq2HILXhu1xNhx61zto= X-Gm-Gg: ASbGncvwlO7sSFFLiF3sh0H6+hj29DBkhJQUaXsWLBOMojil+9BKykMypMeBxOzk7XU gQVwBYBg4JTbwn28R/J/VAR6iEJEViWh0ftkkjcSjj8loPiCfamQ/R9qL0YSNSAY2BmbckhTWOe 0Sxpf48DEnsNI9w0xYaRztsdNTjjTfLRqv6urnEVfRBVrECcuMCTEqHcGCKTg0s85D2SlE7Xt57 WSiF94PriHvzhstOVyu4nyfbe5B1WyPp0aAMsgSYPRYHcD1xy4gwRmsFx5zJFdhDlDK80an9f6K vOJ1V8iFH8emvTYPhtCJ7vcQBok3i90cULe4WYnPROsUJnnU9emsSk3Pg+35gM3YbHWy/6HxQMJ c8NvKetRSsKs= X-Google-Smtp-Source: AGHT+IHZRFV8Mnfm66KxgqbQ+xn/V03aqh6SUiPn4eSw5iLcmKe2WvnZXGgaVLUZu9Zeyu5/wNzwfA== X-Received: by 2002:a05:622a:5587:b0:49c:d64b:3d5f with SMTP id d75a77b69052e-4a708ce76e9mr56271861cf.9.1749569836627; Tue, 10 Jun 2025 08:37:16 -0700 (PDT) Received: from [10.212.144.179] ([12.216.155.19]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4a6ef785c23sm57361681cf.35.2025.06.10.08.37.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 10 Jun 2025 08:37:16 -0700 (PDT) Message-ID: Date: Tue, 10 Jun 2025 09:37:15 -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: shuah , Shuah Khan , "John B. Wyatt IV" , John Kacur , Thomas Renninger , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Thorsten Leemhuis From: Shuah Khan Subject: [GIT PULL] cpupower urgent fix for Linux 6.16-rc2 Hi Rafael, Please pull this cpupower urgent fix for Linux 6.16-rc2. Add unitdir variable for specifying the location to install systemd service units instead of installing under ${libdir}/systemd/system which doesn't work on some distributions. Note: I meant to send this during the merge window and ran into some merge conflicts during the PR test. Decided to wait on it until rc1. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 19272b37aa4f83ca52bdf9c16d5d81bdd1354494: Linux 6.16-rc1 (2025-06-08 13:44:43 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux tags/linux-cpupower-6.16-rc2-fixes for you to fetch changes up to e044b8a9545cd8265c7110c179aeec2624c16455: cpupower: split unitdir from libdir in Makefile (2025-06-09 10:17:46 -0600) ---------------------------------------------------------------- linux-cpupower-6.16-rc2-fixes Add unitdir variable for specifying the location to install systemd service units instead of installing under ${libdir}/systemd/system which doesn't work on some distributions. ---------------------------------------------------------------- Francesco Poli (wintermute) (1): cpupower: split unitdir from libdir in Makefile tools/power/cpupower/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------- diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index be8dfac14076..c43db1c41205 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile @@ -73,6 +73,7 @@ sbindir ?= /usr/sbin mandir ?= /usr/man libdir ?= /usr/lib libexecdir ?= /usr/libexec +unitdir ?= /usr/lib/systemd/system includedir ?= /usr/include localedir ?= /usr/share/locale docdir ?= /usr/share/doc/packages/cpupower @@ -309,9 +310,9 @@ install-tools: $(OUTPUT)cpupower $(INSTALL_DATA) cpupower-service.conf '$(DESTDIR)${confdir}' $(INSTALL) -d $(DESTDIR)${libexecdir} $(INSTALL_PROGRAM) cpupower.sh '$(DESTDIR)${libexecdir}/cpupower' - $(INSTALL) -d $(DESTDIR)${libdir}/systemd/system - sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${libdir}/systemd/system/cpupower.service' - $(SETPERM_DATA) '$(DESTDIR)${libdir}/systemd/system/cpupower.service' + $(INSTALL) -d $(DESTDIR)${unitdir} + sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${unitdir}/cpupower.service' + $(SETPERM_DATA) '$(DESTDIR)${unitdir}/cpupower.service' install-man: $(INSTALL_DATA) -D man/cpupower.1 $(DESTDIR)${mandir}/man1/cpupower.1 @@ -348,7 +349,7 @@ uninstall: - rm -f $(DESTDIR)${bindir}/utils/cpupower - rm -f $(DESTDIR)${confdir}cpupower-service.conf - rm -f $(DESTDIR)${libexecdir}/cpupower - - rm -f $(DESTDIR)${libdir}/systemd/system/cpupower.service + - rm -f $(DESTDIR)${unitdir}/cpupower.service - rm -f $(DESTDIR)${mandir}/man1/cpupower.1 - rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1 - rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1