From patchwork Fri Mar 1 15:06:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1906747 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 4TmWfw1Dwyz23fC for ; Sat, 2 Mar 2024 02:07:52 +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 1rg4UD-0003Gm-Jk; Fri, 01 Mar 2024 15:07:45 +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 1rg4Tq-00036S-Id for kernel-team@lists.ubuntu.com; Fri, 01 Mar 2024 15:07:22 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.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 4C1163F275 for ; Fri, 1 Mar 2024 15:07:22 +0000 (UTC) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-6e58ec82581so1325169b3a.2 for ; Fri, 01 Mar 2024 07:07:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709305641; x=1709910441; 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=QrJE7F6yHWw3hFMILiuOTR9yVKfriirbVG1/Ga7XpEg=; b=ITm9v9jI+dcGjQHS7aKCgd/8/hieo7e59/fAbctr0WfYRbE6dihbUPHRELL6wn6BSk 8vouDkY3pVTMHofzLIWDSOkjC5u7LzY5nggmx41i2YKe8g/h1xDWU+EfoSUjvYN/Oim7 h31vEJQ1HJ9OGJwj2sMh9T84Xr2z/bGsH1sjteDx0yeUG3z/crrYPuyxgp3iFVslfmaM jBVjWCOf+MOndfkcxKOiAgSYLA/VB9WnzS+Edv+GaDRocGOUOTDOGSNpgT/8wr3lztFP Rl3pq9qyE2Jki237zmQI54d3XEqPZbaCdm6IPm0fR4YssItMCGgWbOJmjwCWOxlcd7Hk 9WSA== X-Gm-Message-State: AOJu0YyNhUChdqx0AgSJQnl8I5JABXo1mV3gPPm2v2ST4gJfLbraWNtK PNm/cPADqrUMvdbSjnnGHZ1gC/01yFfXsxHSCvBtkc08JGsc+Wx1U1INo+W58vzbNtvzYf7EIl1 70kqI00sS54GIkxtE4vEjGzXZQm8mm/CpQvMcSSDACjW21BC+Sqcl703Rp61OE3zOSikO9+ullA grwlKsF+12V0T4rRs= X-Received: by 2002:a17:902:be03:b0:1dc:297d:b621 with SMTP id r3-20020a170902be0300b001dc297db621mr1883095pls.16.1709305640945; Fri, 01 Mar 2024 07:07:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IHkXFEBqcLGPS0WzzCMnGfKRKt51sWjE2X0cUk9MGzoJc/Odu/O8olKRMgOBalr/LAL2g7awA== X-Received: by 2002:a17:902:be03:b0:1dc:297d:b621 with SMTP id r3-20020a170902be0300b001dc297db621mr1883075pls.16.1709305640636; Fri, 01 Mar 2024 07:07:20 -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.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 07:07:20 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][J][PATCH 3/3] UBUNTU: [Packaging] Replace debian/dkms-versions with $(DEBIAN)/dkms-versions Date: Fri, 1 Mar 2024 16:06:52 +0100 Message-Id: <20240301150652.107814-6-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 85ecc790713f..57984be4d40b 100755 --- a/debian/rules +++ b/debian/rules @@ -115,8 +115,8 @@ endif 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 binary: binary-indep binary-arch diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 2f27d1710ea5..7d8133e2648e 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -292,7 +292,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"