From patchwork Tue Nov 21 06:57:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1866488 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 4SZFZ74Pkgz1yRq for ; Tue, 21 Nov 2023 17:57:50 +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 1r5KhR-0006Gx-V5; Tue, 21 Nov 2023 06:57:34 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r5Kh9-0006GU-Ki for kernel-team@lists.ubuntu.com; Tue, 21 Nov 2023 06:57:16 +0000 Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) (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-0.canonical.com (Postfix) with ESMTPS id 2876F3F10B for ; Tue, 21 Nov 2023 06:57:15 +0000 (UTC) Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2c8872d92edso10512891fa.2 for ; Mon, 20 Nov 2023 22:57:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700549834; x=1701154634; 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=OWivhiTFNj2566+mq5s8lS879iQTyRp9ObuisUthypo=; b=jDqCR/6XyhOMZWqVSSgA9VjvYjdG9cEOyuUpFWbrStMJ4rlrYT45xA7BrUVC2vhzG/ HL425P61nRc40wD+ICANn4h/B9ViWFNhA+VUkB3ObBUSxUEnl7Hs4RAu5IN8bbOF/z4p ZtlXk/Ci/KTvTTepYk9xd+ROyvIl+uWVEcU/kLWF/1BzXbDDd0ODg8ax7sZbCucS+BBI WMCYY+HbSLsWJU4K5zqWjMNGy7wgJ1GTmZ5/v6vN5vBEwwDeF6QZ7nJeJ5frNDgM2Egt QoJoDpJZljz8OWLy/TnmUF4IYh06AVbwbAqbMgQ3HBO0gYGnFjejd47LiPSGltgwGDw/ P8Lg== X-Gm-Message-State: AOJu0YxqtEzWo6hYw1xTvXsEukpqgrxoy9jePbnc1pvUZmGv4ePvWHHZ IfKq2vgvrvLA/oAyiAGjNW/6EiNNuc8JL4Lvl8zj8iDuNC5D08sgzON0UNy5bAJetg7mN61SzZb Ex+55YSgXasrrTacKOtmRgpL+iQYik/HVBkSnxIJ9LU2qlqhuFA== X-Received: by 2002:a2e:5c46:0:b0:2c5:2103:604b with SMTP id q67-20020a2e5c46000000b002c52103604bmr5909194ljb.2.1700549834415; Mon, 20 Nov 2023 22:57:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IEVNtDAiWlW8L+Uu8YcjSoa5Ku/hnHStumuF33eMBW/vE1uQpkCW0XQzHFuQ/jUJDPNHc+q4w== X-Received: by 2002:a2e:5c46:0:b0:2c5:2103:604b with SMTP id q67-20020a2e5c46000000b002c52103604bmr5909168ljb.2.1700549833450; Mon, 20 Nov 2023 22:57:13 -0800 (PST) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id h20-20020a05600c315400b004063c9f68f2sm16166670wmo.26.2023.11.20.22.57.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 22:57:13 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][M:laptop][PATCH] UBUNTU: [Packaging] laptop: Don't build linux-laptop-tools-{common, host} Date: Tue, 21 Nov 2023 07:57:12 +0100 Message-Id: <20231121065712.722729-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.40.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/2044003 These must not be built for non-main kernels, so disable them and drop the package stanzas from the control stub. Signed-off-by: Juerg Haefliger Acked-by: Manuel Diewald Acked-by: Dimitri John Ledkov --- debian.laptop/control.stub.in | 23 ----------------------- debian.laptop/rules.d/arm64.mk | 2 ++ 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/debian.laptop/control.stub.in b/debian.laptop/control.stub.in index 85a827010da6..b5dff52516fe 100644 --- a/debian.laptop/control.stub.in +++ b/debian.laptop/control.stub.in @@ -75,19 +75,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 -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: arm64 @@ -101,13 +88,3 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM =HUMAN=. You probably want to install linux-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.laptop/rules.d/arm64.mk b/debian.laptop/rules.d/arm64.mk index b86b5c7abead..964a1f3bb4f1 100644 --- a/debian.laptop/rules.d/arm64.mk +++ b/debian.laptop/rules.d/arm64.mk @@ -23,3 +23,5 @@ do_dtbs = true do_libc_dev_package = false do_doc_package = false do_source_package = false +do_tools_common = false +do_tools_host = false