From patchwork Wed Feb 7 11:15:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1896092 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 4TVHbw4J44z23gT for ; Wed, 7 Feb 2024 22:15:56 +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 1rXfu2-0003Ta-0g; Wed, 07 Feb 2024 11:15:42 +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 1rXftf-0003OR-5w for kernel-team@lists.ubuntu.com; Wed, 07 Feb 2024 11:15:24 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.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 C9E61405F2 for ; Wed, 7 Feb 2024 11:15:18 +0000 (UTC) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-558aafe9bf2so445660a12.1 for ; Wed, 07 Feb 2024 03:15:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707304518; x=1707909318; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7fpd6XFvy9YMKOTBogedD/Rdygy88flN7Gy69V4xOyk=; b=TapfPjRXFZfjYa/85TnQnCp4Y84KvNTST2jyT7BiVzcaTotqbzlN1HTTUZIaxJ75D5 7nv7DWFUGCkaaVm1dOFOBvLmh1N6yrgqnV+21J38pStddOELG1f2Su0lvV2Vx909FvB3 Jb4+hYs1DnrynPCx1WmvQq8Eb2ECK1mBgvByeMOb1h5+aijUeMb5LlAXxHFNoQ1ibv13 jHkXV3IvDP2PiTFvDe2nDK/DqcgGl+bKt8x9LK2stCVSC0j4DyskHV1sN83aoYcYfaAX BiTPMPtO9jkcjCvZY0PAlQOTfrGh4LJ2cVZkjAdYewhEOZfqVMpbxfWh+OdOZrCd1mDc IcIQ== X-Gm-Message-State: AOJu0YxzpLnon4z2YxeM2prHV4mwyftyvescS+pCpoDG0a8ec1/1mdWn 741y1aowK6n9sWsWMSm6g0t8kUlDN/76DHojpmRioQy+HTy4zKusYINR44kgvo/XT8OgXshLbKT P3CaOJ1QcCSWmS9Fk/xhS4ptdXZmaQeg8wA08cAk5vP5ngIJ504puYyZf6yV4ckgYk57/fILREm PZ/rM7MwgTIA== X-Received: by 2002:a05:6402:695:b0:560:2a89:2540 with SMTP id f21-20020a056402069500b005602a892540mr3599219edy.22.1707304518351; Wed, 07 Feb 2024 03:15:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IHIRS4vz00Fx7PTmd/fJxf0QlPuy7vL00hiaFUwx6Xlv7L2Z7ouVz09u2KHGYwU4PzjEX9y3Q== X-Received: by 2002:a05:6402:695:b0:560:2a89:2540 with SMTP id f21-20020a056402069500b005602a892540mr3599209edy.22.1707304517962; Wed, 07 Feb 2024 03:15:17 -0800 (PST) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id r4-20020aa7d584000000b0055ff708dee3sm550873edq.11.2024.02.07.03.15.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 03:15:17 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Noble][PATCH 1/2] UBUNTU: [Packaging] Move indep tools package stubs to debian/control.d Date: Wed, 7 Feb 2024 12:15:14 +0100 Message-Id: <20240207111515.1984805-2-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240207111515.1984805-1-juerg.haefliger@canonical.com> References: <20240207111515.1984805-1-juerg.haefliger@canonical.com> 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/2048183 The following packages may only be built for the main linux source package. Similar to linux-libc-dev, move the packaging stubs to debian/control.d and only include them if the source package name is indeed 'linux': - linux-tools-common - linux-cloud-tools-common - linux-host-tools Also change the package names in the rules to linux-* to further make sure that we don't accidentially build linux--* packages should a derivative's control file contain incorrect package stanzas. Signed-off-by: Juerg Haefliger --- debian.master/control.stub.in | 35 ------------------- .../control.d/linux-cloud-tools-common.stub | 10 ++++++ debian/control.d/linux-tools-common.stub | 12 +++++++ debian/control.d/linux-tools-host.stub | 9 +++++ debian/rules | 3 ++ debian/rules.d/0-common-vars.mk | 6 ++-- 6 files changed, 37 insertions(+), 38 deletions(-) create mode 100644 debian/control.d/linux-cloud-tools-common.stub create mode 100644 debian/control.d/linux-tools-common.stub create mode 100644 debian/control.d/linux-tools-host.stub diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index daeeb406e542..5bc5986172e1 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -93,19 +93,6 @@ Description: Header files related to Linux kernel version PKGVER that want the latest kernel headers. Please read /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details -Package: SRCPKGNAME-tools-common -Build-Profiles: -Architecture: all -Multi-Arch: foreign -Section: kernel -Priority: optional -Provides: bpftool -Depends: ${misc:Depends}, lsb-release, hwdata -Description: Linux kernel version specific tools for version PKGVER - This package provides the architecture independent parts for kernel - version locked tools (such as perf and x86_energy_perf_policy) for - version PKGVER. - Package: SRCPKGNAME-tools-PKGVER-ABINUM Build-Profiles: Architecture: amd64 armhf arm64 ppc64el s390x @@ -119,17 +106,6 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM =HUMAN=. You probably want to install linux-tools-PKGVER-ABINUM-. -Package: SRCPKGNAME-cloud-tools-common -Build-Profiles: -Architecture: all -Multi-Arch: foreign -Section: kernel -Priority: optional -Depends: ${misc:Depends} -Description: Linux kernel version specific cloud tools for version PKGVER - This package provides the architecture independent parts for kernel - version locked tools for cloud tools for version PKGVER. - Package: SRCPKGNAME-cloud-tools-PKGVER-ABINUM Build-Profiles: Architecture: amd64 armhf @@ -141,14 +117,3 @@ Description: Linux kernel version specific cloud tools for version PKGVER-ABINUM version locked tools for cloud tools for version PKGVER-ABINUM on =HUMAN=. You probably want to install linux-cloud-tools-PKGVER-ABINUM-. - -Package: SRCPKGNAME-tools-host -Build-Profiles: -Architecture: all -Multi-Arch: foreign -Section: kernel -Priority: optional -Depends: ${misc:Depends}, python3 -Description: Linux kernel VM host tools - This package provides kernel tools useful for VM hosts. - diff --git a/debian/control.d/linux-cloud-tools-common.stub b/debian/control.d/linux-cloud-tools-common.stub new file mode 100644 index 000000000000..724dab9bef00 --- /dev/null +++ b/debian/control.d/linux-cloud-tools-common.stub @@ -0,0 +1,10 @@ +Package: linux-cloud-tools-common +Build-Profiles: +Architecture: all +Multi-Arch: foreign +Section: kernel +Priority: optional +Depends: ${misc:Depends} +Description: Linux kernel version specific cloud tools for version PKGVER + This package provides the architecture independent parts for kernel + version locked tools for cloud tools for version PKGVER. diff --git a/debian/control.d/linux-tools-common.stub b/debian/control.d/linux-tools-common.stub new file mode 100644 index 000000000000..575897a6bf59 --- /dev/null +++ b/debian/control.d/linux-tools-common.stub @@ -0,0 +1,12 @@ +Package: linux-tools-common +Build-Profiles: +Architecture: all +Multi-Arch: foreign +Section: kernel +Priority: optional +Provides: bpftool +Depends: ${misc:Depends}, lsb-release, hwdata +Description: Linux kernel version specific tools for version PKGVER + This package provides the architecture independent parts for kernel + version locked tools (such as perf and x86_energy_perf_policy) for + version PKGVER. diff --git a/debian/control.d/linux-tools-host.stub b/debian/control.d/linux-tools-host.stub new file mode 100644 index 000000000000..f2ea6a9f7fff --- /dev/null +++ b/debian/control.d/linux-tools-host.stub @@ -0,0 +1,9 @@ +Package: linux-tools-host +Build-Profiles: +Architecture: all +Multi-Arch: foreign +Section: kernel +Priority: optional +Depends: ${misc:Depends}, python3 +Description: Linux kernel VM host tools + This package provides kernel tools useful for VM hosts. diff --git a/debian/rules b/debian/rules index 1319a5f5d86a..eb2d9a82ffd6 100755 --- a/debian/rules +++ b/debian/rules @@ -166,6 +166,9 @@ include $(DROOT)/rules.d/4-checks.mk control_files := $(DEBIAN)/control.stub.in ifeq ($(src_pkg_name),linux) control_files += debian/control.d/linux-libc-dev.stub + control_files += debian/control.d/linux-tools-common.stub + control_files += debian/control.d/linux-cloud-tools-common.stub + control_files += debian/control.d/linux-tools-host.stub endif # Calculate Ubuntu Compatible Signing levels diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 0f6108d7ca05..1c94e2e75ebd 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -139,12 +139,12 @@ else do_tools?=false endif tools_pkg_name=$(src_pkg_name)-tools-$(abi_release) -tools_common_pkg_name=$(src_pkg_name)-tools-common +tools_common_pkg_name=linux-tools-common tools_flavour_pkg_name=linux-tools-$(abi_release) cloud_pkg_name=$(src_pkg_name)-cloud-tools-$(abi_release) -cloud_common_pkg_name=$(src_pkg_name)-cloud-tools-common +cloud_common_pkg_name=linux-cloud-tools-common cloud_flavour_pkg_name=linux-cloud-tools-$(abi_release) -hosttools_pkg_name=$(src_pkg_name)-tools-host +hosttools_pkg_name=linux-tools-host # The general flavour specific image package. do_flavour_image_package=true