From patchwork Mon Mar 4 09:33:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1907473 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 4TpD7d5cpfz23fC for ; Mon, 4 Mar 2024 20:35:09 +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 1rh4ip-0003N9-5o; Mon, 04 Mar 2024 09:34:59 +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 1rh4i6-0002pi-6t for kernel-team@lists.ubuntu.com; Mon, 04 Mar 2024 09:34:15 +0000 Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.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 0B57F3F27F for ; Mon, 4 Mar 2024 09:34:14 +0000 (UTC) Received: by mail-il1-f200.google.com with SMTP id e9e14a558f8ab-3653092aee9so47103255ab.0 for ; Mon, 04 Mar 2024 01:34:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709544852; x=1710149652; 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=PRFdnwmhI6ictCqfrL6ICjlRIN0fPR8RA/BTcsqBYi0=; b=W7721Mc4DpqZORmLXALGf9f1M7PgpD4Mcw637NJxAN4looAkSYOxcBaWpQarWIkrXk rnAbG2pYk0z0J3ZCKL2QV/2KynbDO6xFDQlufdjOCHLMAD4OnuTFTR38hapQBjrxBxDP rSIwBqGJ6s4Y8Vq68BYe3tMFdbK1za7ab7cQTpJXiuuTUPdRYtcmfCoGiotuNI0zmsHG JUdyTl/nzuyCaRCnjW77RFIVn54eNMgJ4iJEFj9dpe6gX7fannYhjiLqHy+I7HT8k9ZQ 9EBx9t2+mrkq3C8W7YnszFUmli/5HfsZPnErPQTmhL7kD+rTJ1P5l9foQNSBJskAqW+y oAHQ== X-Gm-Message-State: AOJu0YyKPgVrl5nN+wsFqr5r9gc6cIBhYC3ZXYrwtG/2Py6w91vmyHNl cXbCbCoHWcS/mpLvh3llPY/xSSVw0w7N3tcMv4fwrEILrMaMvvSYSSeBKzsvuNqyECDO/8S54KC iMWhL1xsM92qTod66qiS+9d4oB6jqI23ZnvGFnHekjXEBNy+VhVq/z3Idrm4pJP8cEvrBu4TndI gK4L06WnS9hv0f X-Received: by 2002:a05:6e02:1608:b0:365:105d:e0b5 with SMTP id t8-20020a056e02160800b00365105de0b5mr11766764ilu.8.1709544852710; Mon, 04 Mar 2024 01:34:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IGwmT8kprC4NiLLrHK79y4OT1ptvhMBqZ3A1m8CXGWBCEM306Z6mjddKZGtaCUUTXx0JnJXVw== X-Received: by 2002:a05:6e02:1608:b0:365:105d:e0b5 with SMTP id t8-20020a056e02160800b00365105de0b5mr11766757ilu.8.1709544852465; Mon, 04 Mar 2024 01:34:12 -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.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 01:34:12 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 3/4 v2] UBUNTU: [Packaging] Replace debian/dkms-versions with $(DEBIAN)/dkms-versions Date: Mon, 4 Mar 2024 10:33:49 +0100 Message-Id: <20240304093352.38900-5-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 | 10 +++++----- debian/rules.d/2-binary-arch.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index e49f8376be433..6e9b21c1306c4 100755 --- a/debian/rules +++ b/debian/rules @@ -124,13 +124,13 @@ endif do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) # Versions of dkms packages. -dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { print $$2; }' debian/dkms-versions) -dkms_vbox_guest_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) -dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat / { print $$2; }' debian/dkms-versions) +dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { print $$2; }' $(DEBIAN)/dkms-versions) +dkms_vbox_guest_version=$(shell gawk '/^virtualbox/ { print $$2; }' $(DEBIAN)/dkms-versions) +dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat / { print $$2; }' $(DEBIAN)/dkms-versions) # 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/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 0703c9bc0b3dc..ea54ffc2fd14c 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -79,7 +79,7 @@ endef # nvidia_build 450 # nvidia_build 450-server define nvidia_build = - $(call nvidia_build_payload,$(1),$(shell echo $(1) | sed -e 's/-server/srv/'),$(shell awk '/^nvidia-graphics-drivers-$(1) / {print($$2);}' debian/dkms-versions)) + $(call nvidia_build_payload,$(1),$(shell echo $(1) | sed -e 's/-server/srv/'),$(shell awk '/^nvidia-graphics-drivers-$(1) / {print($$2);}' $(DEBIAN)/dkms-versions)) endef