From patchwork Wed May 31 06:16:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1788142 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=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=g5IuaU8f; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (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 4QWJv8252fz20Py for ; Wed, 31 May 2023 16:16:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1q4F8X-0005Zg-T3; Wed, 31 May 2023 06:16:45 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1q4F8V-0005XO-Dg for kernel-team@lists.ubuntu.com; Wed, 31 May 2023 06:16:43 +0000 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (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 37E70423A3 for ; Wed, 31 May 2023 06:16:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1685513801; bh=tagRusJ/vzeSZawKzlTqhbQWB+Ssaaiwz9BLVYHVJPk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=g5IuaU8fZWIgZW1QNaI7lxlcR++Ezww2ztgMHyaPzMMDburZA7xIuUedWBPwrjAQT B/bjvxWvAhlMZg731CMWAysb5fio8L+PAqOEIYwyBIu6IYTCD5RLbKMx4KTSyLV0Lu f7IbNdiyIumMqLaRnNgQp87Ms7wEcu1X7DCnxGHyLl/ZDB3GUiSgmlXk4QDnH2ZqRA z3o3waUXjPV5vOduwLdIsSibl9J15k3quqP5FZjjE4zgREubxdjyX9TK3mlvw2FrL5 7ics5GE0jKCcHefV17IPejDeZ5OdUud3EY5/dZGcDZQeeDpPhGQ2j9IYOlN3MA5uf1 w93prtpztsz3A== Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-94a34a0b75eso454895466b.1 for ; Tue, 30 May 2023 23:16:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685513800; x=1688105800; 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=tagRusJ/vzeSZawKzlTqhbQWB+Ssaaiwz9BLVYHVJPk=; b=AG0HMtMsJg9mP9+MeFeh1C/uDSp9sx15BJH43nEeK66v/rpR1URuYLZUPeCDuKuEl/ tpvX+yWXkG/Jm5e8oHwZIeyYTKXB3sVFZB71mitG9TRe60qB1QVKfcaziC+AlGdDPFpX PlKSAQXnKlvH9AkdB/sYSPHfGDqpKD5l/GvcalW+ifTcmsC7ravDH5QiNV0+QZNNWhCL 2lONJRxLoPH2+fijyQ320GYTgP7TKEuXrjk/q7HxG0DXaVBQMTH+cWMpbdmZG2EFoH5F OhKwwVbAQ9l2EJTSAwvTWTZVu4i9i30cIsCIzZ2Dg/zx524DLVUDrXIkhAAoNnwOrjK2 SCDQ== X-Gm-Message-State: AC+VfDzFGwB7cJRCFeZAYKnP1BVlj/9Nnm9e8lvvYNV3iK5Bng/nkJ+j Ua+m83e1Th/fe4AJmghY+yQzDDuizAGUIX05X6GcsByaZMuMv6flyntiHTf+cA6jtGV2iWDHDlo 6IBuUvNRJ7qzthzm0rM9+/iAEY8+MJ+HLuiosR936hVdHte8KAw== X-Received: by 2002:a17:907:1628:b0:970:1b2d:45cc with SMTP id hb40-20020a170907162800b009701b2d45ccmr4892668ejc.57.1685513800374; Tue, 30 May 2023 23:16:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7VyIWBHS9Q0uk+5GrEBY6UFmfRjkzum7Q/45NRNSKMj1SfLu7Iz6TjLwgGjge1mlw9OMqIyg== X-Received: by 2002:a17:907:1628:b0:970:1b2d:45cc with SMTP id hb40-20020a170907162800b009701b2d45ccmr4892652ejc.57.1685513799993; Tue, 30 May 2023 23:16:39 -0700 (PDT) Received: from righiandr-XPS-13-7390.homenet.telecomitalia.it (host-82-57-63-8.retail.telecomitalia.it. [82.57.63.8]) by smtp.gmail.com with ESMTPSA id m13-20020a170906160d00b0095342bfb701sm8580556ejd.16.2023.05.30.23.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 23:16:39 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [SRU][L][PATCH v2] UBUNTU: [Packaging] introduce do_lib_rust and enable it only on generic amd64 Date: Wed, 31 May 2023 08:16:35 +0200 Message-Id: <20230531061636.6607-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531061636.6607-1-andrea.righi@canonical.com> References: <20230531061636.6607-1-andrea.righi@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/2021605 Introduce the new variable do_lib_rust to enable or disable the packaging of linux-lib-rust and enable it only on the generic amd64 kernel. This allows to avoid building any kind of Rust artifact in other kernels, except for the generic one and only on amd64. Signed-off-by: Andrea Righi --- debian.master/rules.d/amd64.mk | 1 + debian/rules.d/1-maintainer.mk | 1 + debian/rules.d/2-binary-arch.mk | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index d0384f0227a47..afed3e50966b9 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -21,3 +21,4 @@ do_extras_package = true do_tools_common = true do_tools_acpidbg = true do_odm_drivers = true +do_lib_rust = true diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index c625715eacf41..0aaeee7182f8b 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -104,6 +104,7 @@ printenv: @echo "do_common_headers_indep = $(do_common_headers_indep)" @echo "do_full_source = $(do_full_source)" @echo "do_odm_drivers = $(do_odm_drivers)" + @echo "do_lib_rust = $(do_lib_rust)" @echo "do_tools = $(do_tools)" @echo "do_tools_common = $(do_tools_common)" @echo "do_any_tools = $(do_any_tools)" diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 630a335616a74..aa790f98f000d 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -132,7 +132,9 @@ $(stampdir)/stamp-install-%: $(stampdir)/stamp-build-% $(stampdir)/stamp-install dh_prep -p$(bin_pkg_name)-$* dh_prep -p$(mods_pkg_name)-$* dh_prep -p$(hdrs_pkg_name)-$* +ifeq ($(do_lib_rust),true) dh_prep -p$(rust_pkg_name)-$* +endif $(foreach _m,$(all_standalone_dkms_modules), \ $(if $(enable_$(_m)),dh_prep -p$(dkms_$(_m)_pkg_name)-$*;)\ ) @@ -675,7 +677,9 @@ endif $(call dh_all,$(pkgbldinfo)) $(call dh_all,$(pkghdr)) +ifeq ($(do_lib_rust),true) $(call dh_all,$(pkgrust)) +endif ifneq ($(skipsub),true) @set -e; for sub in $($(*)_sub); do \