From patchwork Fri Mar 1 15:06:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1906745 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 4TmWfg14KWz23fC for ; Sat, 2 Mar 2024 02:07:39 +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 1rg4Tq-000350-BW; Fri, 01 Mar 2024 15:07:22 +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 1rg4Tj-00031f-O5 for kernel-team@lists.ubuntu.com; Fri, 01 Mar 2024 15:07:15 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.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-1.canonical.com (Postfix) with ESMTPS id 7834F3F281 for ; Fri, 1 Mar 2024 15:07:15 +0000 (UTC) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-1dbde5c4d68so19563125ad.2 for ; Fri, 01 Mar 2024 07:07:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709305634; x=1709910434; 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=ve6GVhU2c2DkPT0ag9hS6CRyi5zMMZ0gj5OBC3X3PZs=; b=CjzyznB/eVscUMQDMfxO68JurXzCymoD/MOD7QDJBBLal+k3qAbbtMUFvwvQmoWuam l54uV+AhxP1WGC7M8eaLlEXnR0HyOD3+CUMQMuH7acJKldQm9y2Dt3Um3ldaDi3m6zfh B42pnL0druAMQYgEYjt9WJaTA7ukwo9U+21UNqwfX48eze4Qw3ILESmC2UVwwBYPaHaN v8npJHg/WiTvfH6kO2JaMgyrD0CFi34JlfflZ7V9KNEqol48P101px/u28uIEsdyMmkI Kq3knRKEKUrMfYhz6VjzZX7w6lD9f/bopp0fHJSY53hMv1nG7lnsJS1ml2vp2a48akGp xejA== X-Gm-Message-State: AOJu0YznWwVr/4HD+C+77SJTwoM8caB3gJNGPxM8mH05TgsSPreK4xlG BAg7cNOzU550t1N0Fle/oSNT72pdR/EL9fLnK2Oyh5zdLbqT2HE0YnQRsW38i3bFVvD5Q0YiT1m kiE+ntZoL6BtXTImVjDzAgpJxK0ZY7JZvKJAf4L2O31qIAfw9ch+bcPzSoVav8a5jvFC+WAWUDL U3QqbBkMC2fWoiRQY= X-Received: by 2002:a17:902:c3c4:b0:1dc:cd2e:fc68 with SMTP id j4-20020a170902c3c400b001dccd2efc68mr1735722plj.27.1709305634019; Fri, 01 Mar 2024 07:07:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnP09SQa5y9ZREyOgYuCh9i8e0CgotQz5fSRkwc5C07lz397Gq3JfiwlD2cGtarA37d4k97g== X-Received: by 2002:a17:902:c3c4:b0:1dc:cd2e:fc68 with SMTP id j4-20020a170902c3c400b001dccd2efc68mr1735698plj.27.1709305633661; Fri, 01 Mar 2024 07:07:13 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c490]) by smtp.gmail.com with ESMTPSA id mj16-20020a1709032b9000b001db519cb710sm3553442plb.246.2024.03.01.07.07.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 07:07:13 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][M][PATCH 3/3] UBUNTU: [Packaging] Replace debian/dkms-versions with $(DEBIAN)/dkms-versions Date: Fri, 1 Mar 2024 16:06:50 +0100 Message-Id: <20240301150652.107814-4-roxana.nicolescu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301150652.107814-1-roxana.nicolescu@canonical.com> References: <20240301150652.107814-1-roxana.nicolescu@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/2055685 debian/dkms-versions has moved to debian./dkms-versions Signed-off-by: Roxana Nicolescu --- debian/rules | 4 ++-- debian/rules.d/0-common-vars.mk | 2 +- debian/scripts/control-create | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index b78aff60ce24..e68922aef201 100755 --- a/debian/rules +++ b/debian/rules @@ -118,8 +118,8 @@ $(foreach _m,$(all_built-in_dkms_modules), \ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) # NVIDIA DKMS package gross series split into desktop and server. -nvidia_desktop_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*\) .*/\1/p' debian/dkms-versions) -nvidia_server_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*-server\) .*/\1/p' debian/dkms-versions) +nvidia_desktop_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*\) .*/\1/p' $(DEBIAN)/dkms-versions) +nvidia_server_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*-server\) .*/\1/p' $(DEBIAN)/dkms-versions) # Debian Build System targets .PHONY: binary diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 1dc77bcf78e5..c65f3d12a694 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -276,7 +276,7 @@ all_dkms_modules = subst_paired = $(subst $(firstword $(subst =, ,$(1))),$(lastword $(subst =, ,$(1))),$(2)) recursive_call = $(if $(2),$(call recursive_call,$(1),$(wordlist 2,$(words $(2)),$(2)),$(call $(1),$(firstword $(2)),$(3))),$(3)) -$(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DROOT)/dkms-versions), \ +$(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DEBIAN)/dkms-versions), \ $(eval _params = $(subst !, ,$(_line))) \ $(eval _deb_pkgname = $(firstword $(_params))) \ $(eval _deb_version = $(word 2,$(_params))) \ diff --git a/debian/scripts/control-create b/debian/scripts/control-create index 5d0e3e46556c..243e74d9624e 100755 --- a/debian/scripts/control-create +++ b/debian/scripts/control-create @@ -64,4 +64,4 @@ do -e "s#ARCH#$arch#g" \ -e "s#MODULE#$module#g" \ -e "s#FLAVOUR#$flavour#g" -done <"debian/dkms-versions" +done <"${DEBIAN}/dkms-versions"