From patchwork Wed Dec 6 00:00:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1872363 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SlHc74h8Dz23mf for ; Wed, 6 Dec 2023 11:00:54 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rAfLC-0007lg-8D; Wed, 06 Dec 2023 00:00:38 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rAfL2-0007lN-Ia for kernel-team@lists.ubuntu.com; Wed, 06 Dec 2023 00:00:29 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 912803F18B for ; Wed, 6 Dec 2023 00:00:27 +0000 (UTC) Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-332e82bb756so67655f8f.1 for ; Tue, 05 Dec 2023 16:00:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701820826; x=1702425626; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xToa+rI+Q/y6OG01Y3tLbG0yf28h78e7eS0qVp52hJI=; b=oSmT35EmVhkEChPMwpKPcT7PB/LO3KSAqGvzcFREouM6y4wX9Gyr/5mVvjDrpMTgD/ cEoDD/L/Kog5pSDB9/CflxHlKbUjlCtquL/nUiquX/r/RYbZUH9RF7BUq+rAoGt6v/iS 2ip60iK32YuAribpnmUb05G/tjed8od2xZ6Tep9JD9Haunlj+Wfkq92Iwr26NuHvHfcx 6IaqqNMLpMdJteheqyx0TIm2AJ2HOBfH1VKx7IuOcz9H6E/uTWb0g7oD7s90EkU+ADmi 0HXNhvWZN57vA+HDf5jIEA+zhveVD0bNahib3IWQZDddK8apsTneyUJL9SCEB/uCDCpG 4mGg== X-Gm-Message-State: AOJu0YzBMUtEg6UPpohIu8vYWsDxPbGyxalmSDhaUrywhSZCkczzN5tS Q4QQFviMxATVFKyI7vgLasrS/1tVcDsMOa+bgDCk9O6EHZG7UPzXRXNwY8Pqoe2O1zct1DahhN9 zzQhltvdhSNIrFE7u7st63jCF4Vi+19zYdgThnZV1TKL7anC6sw== X-Received: by 2002:a05:6000:ac6:b0:333:4339:5724 with SMTP id di6-20020a0560000ac600b0033343395724mr9282wrb.49.1701820826503; Tue, 05 Dec 2023 16:00:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IHbqlL8X0VAmedf/8JWE7cGT2/G7xmWauIqvNXs2vAYc1n18muyUVpDLS/Ark34Vuundm+X4A== X-Received: by 2002:a05:6000:ac6:b0:333:4339:5724 with SMTP id di6-20020a0560000ac600b0033343395724mr9274wrb.49.1701820826063; Tue, 05 Dec 2023 16:00:26 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id q18-20020a05600000d200b003334041c3edsm8847192wrx.41.2023.12.05.16.00.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 16:00:25 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [SRU][JAMMY][MANTIC][UNSTABLE][PATCH] UBUNTU: [Packaging] Statically link libcpupower into cpupower tool Date: Wed, 6 Dec 2023 00:00:24 +0000 Message-Id: <20231206000024.1285161-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2035971 Currently we ship tools for every kernel flavour and backport, and each one of them may have new features in cpupower & libcpupower. Statically link those in, such that there are no installation conflicts. This resolves all current file conflicts between multiple kernel flavours in the Ubuntu Archive. Separately, a public libcpupower1 & libcpupower-dev for non-kernel / non-linux-tools use cases will be provided separately, under a stable soname (not flavour or kernel version specific). Signed-off-by: Dimitri John Ledkov Acked-By: You-Sheng Yang Acked-by: Manuel Diewald --- debian/rules.d/2-binary-arch.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index cbd5e1f065..c7f6d47057 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -676,13 +676,11 @@ ifeq ($(do_tools_acpidbg),true) cd $(builddirpa)/tools/power/acpi && make clean && make CFLAGS="-g -O2 -static -I$(builddirpa)/include" CROSS_COMPILE=$(CROSS_COMPILE) acpidbg endif ifeq ($(do_tools_cpupower),true) - # Allow for multiple installed versions of cpupower and libcpupower.so: - # Override LIB_MIN in order to to generate a versioned .so named - # libcpupower.so.$(abi_release) and link cpupower with that. make -C $(builddirpa)/tools/power/cpupower \ CROSS_COMPILE=$(CROSS_COMPILE) \ CROSS=$(CROSS_COMPILE) \ - LIB_MIN=$(abi_release) CPUFREQ_BENCH=false + STATIC=true \ + CPUFREQ_BENCH=false endif ifeq ($(do_tools_perf),true) cd $(builddirpa) && $(kmake) $(defconfig) @@ -732,10 +730,6 @@ endif ifeq ($(do_tools_cpupower),true) install -m755 $(builddirpa)/tools/power/cpupower/cpupower \ $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) - # Install only the full versioned libcpupower.so.$(abi_release), not - # the usual symlinks to it. - install -m644 $(builddirpa)/tools/power/cpupower/libcpupower.so.$(abi_release) \ - $(toolspkgdir)/usr/lib/ endif ifeq ($(do_tools_perf),true) install -m755 $(builddirpa)/tools/perf/perf $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)