From patchwork Mon Mar 4 09:33:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1907469 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 4TpD6x2g76z23l2 for ; Mon, 4 Mar 2024 20:34:33 +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 1rh4iE-0002tb-7Y; Mon, 04 Mar 2024 09:34: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 1rh4i3-0002om-QB for kernel-team@lists.ubuntu.com; Mon, 04 Mar 2024 09:34:11 +0000 Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.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 7FDB23F125 for ; Mon, 4 Mar 2024 09:34:11 +0000 (UTC) Received: by mail-oi1-f200.google.com with SMTP id 5614622812f47-3c195196808so5570741b6e.1 for ; Mon, 04 Mar 2024 01:34:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709544850; x=1710149650; 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=r7Qf7UB/R1gQVcyAYRxSfC+LT2AFgDiA9zFNehc9c+Y=; b=JteaJ1S/LVfXHHuCJt2RPtot9RA620nwENBzPyGBUnAKqKiZrws4hoJX20TMuOJ8Vy /TRA53rofdC/JvUjzL7xVg6try0dlhZQALYN3TNiQnT4eTCFoiGU0+MTXCAfiz77Y9fd pjI2jcI9M+00U2SeDgcBATL9ccNw2w4zXKprBDZ/2e6FcMdKZIHqWsfc382aJ1IEQT1S MCNKPfU66T+6ZHn19DBEHFtn2DFP6XO5Xe1G3Z/ynapLEsWaoGHKHGSz0c1q9tP46FHM xoI5ihl4sUrATUfVncJRJoGVutod7KcqrFpPpCKC4EOpBf2AyjPBa/ag+jiuBgecKLGE 4oAg== X-Gm-Message-State: AOJu0Yw9P2GZ67gj1j0MyNOnGmEwe0QzKN5nGgh7ymVbal9pJ5gs5EQO tVwC+QORWapOXZ+MApzf63r8nYDZEPedGMjFtpDInrWjE1D4YvNxqMtnFBW1y0ka1bovbGA1q5d sWjcmHJpEj2PHNbeSye+hMfKVw/tIN0V9y7HVuHp6t1IWOzLpTGp6iOAej/iE841rPvdPHw2DlP OF0pujW3pJx8c2 X-Received: by 2002:a05:6808:2023:b0:3c1:e277:6efd with SMTP id q35-20020a056808202300b003c1e2776efdmr6851318oiw.49.1709544850320; Mon, 04 Mar 2024 01:34:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IFkRp2cJcTAuhuk0p4CczF5/OYwrzaJBNecUJX5XER158aSHuMjzo0zkk8gA2DQIZDvhO9rEw== X-Received: by 2002:a05:6808:2023:b0:3c1:e277:6efd with SMTP id q35-20020a056808202300b003c1e2776efdmr6851309oiw.49.1709544850048; Mon, 04 Mar 2024 01:34:10 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c490]) by smtp.gmail.com with ESMTPSA id g1-20020a633741000000b005e47afd5c5dsm7135520pgn.37.2024.03.04.01.34.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 01:34:09 -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: Mon, 4 Mar 2024 10:33:48 +0100 Message-Id: <20240304093352.38900-4-roxana.nicolescu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240304093352.38900-1-roxana.nicolescu@canonical.com> References: <20240304093352.38900-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 Acked-by: Stefan Bader --- 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"