From patchwork Fri Mar 1 15:06:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1906746 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 4TmWfq6kYZz23fC for ; Sat, 2 Mar 2024 02:07:47 +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 1rg4U3-00038l-Fg; Fri, 01 Mar 2024 15:07:36 +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 1rg4Tp-000351-CJ for kernel-team@lists.ubuntu.com; Fri, 01 Mar 2024 15:07:21 +0000 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 9D2923F280 for ; Fri, 1 Mar 2024 15:07:20 +0000 (UTC) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-1dccd2efdbfso23439605ad.2 for ; Fri, 01 Mar 2024 07:07:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709305639; x=1709910439; 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=iE1ruPr/cyj22HzUJUmhe4iENGTJODeoXcnITYkgFis=; b=UgjhiSYHy0ciI/39OlLtfgpdCzlWNtmtfg3FDU/VbEnwfvrQYWXwN6EOcC8DXBn/Zr UfWVV8++lCCpw8h8ZklgwqeNiUskjJoo28xtBwjBQvsPYjtCIbFJ6NbjXa9M7hZ75XzB 5D2GNG68WzA8luzt+L0roIp9i8m5g4+0d0JahWgt45vNGmaWpZOHK5O0C3l6w4M7uey7 Ngi4zGW+4WCAtdR7DF9cTLdGVoeqepz0Wr5rL/fjBVKxpeJ51RR6iQ8DGbwZ6RDf+mum FigiLiPpURVG4G/zl1R8x6kSU/clhXUqbogtkCNLYSUtwMT2aS3ZS7GTA9332s1/pyob vJHg== X-Gm-Message-State: AOJu0YzkKO63d8fcbVcnU9z2gdznHEbz7efHUcqK7DKwOyqvE0pjrNuQ kB9Z38ofzikUEmqt5HTsRgrYgtfbgQn741U1Hi/TXwnDxGLJ6uKvgC/GrOHkc4NGvRLiFuddrar 4mr6QpuOAxahh5yNs2xKRD08Vm3698Jxz5Ovp/p0qVZ/3aKDxiltU1QVdu4C4wVyNb9KYi5rWGZ j0mw2nQLy45jQOttU= X-Received: by 2002:a17:903:98d:b0:1db:faa6:d4a9 with SMTP id mb13-20020a170903098d00b001dbfaa6d4a9mr2466082plb.69.1709305637818; Fri, 01 Mar 2024 07:07:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IEOa4kOtCleyMprveBbZrEoaAJmAAR57CjPLbAgAtx07s3vequfViXsK32B9muxN3bL2NyPNg== X-Received: by 2002:a17:903:98d:b0:1db:faa6:d4a9 with SMTP id mb13-20020a170903098d00b001dbfaa6d4a9mr2466051plb.69.1709305637452; Fri, 01 Mar 2024 07:07:17 -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.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 07:07:17 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 3/3] UBUNTU: [Packaging] Replace debian/dkms-versions with $(DEBIAN)/dkms-versions Date: Fri, 1 Mar 2024 16:06:51 +0100 Message-Id: <20240301150652.107814-5-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 | 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