From patchwork Fri Jan 22 16:23:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1430432 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DMl1j67TVz9sS8; Sat, 23 Jan 2021 03:23:37 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1l2zDg-0004LC-QN; Fri, 22 Jan 2021 16:23:32 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l2zDX-0004Ez-1Q for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:23 +0000 Received: from mail-ed1-f71.google.com ([209.85.208.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l2zDW-0006Y3-N0 for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:22 +0000 Received: by mail-ed1-f71.google.com with SMTP id y6so3166646edc.17 for ; Fri, 22 Jan 2021 08:23:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zCrQ06hKIYzOp6p6I0KjJXAp8n6d3xUYX3QhUpYpodQ=; b=Io1Tvd71ei3SXpJX6YmQ1WL/ftf95HzK1GXGZOoL8edDvAcTOqsmkYofooz2t7qjOi EmZYXgeeCKFq2ibcP2+ZXA0BAqMAmr2fUYye0Tm1iD7yMhgJiNsD6cTgX0v4YP18KSJQ EGyhAuiDtbw48tg+ZLDwKQfHHqHB7CBqU6TBAG5PXOPNd+DHFtNR3dHEnoYzonAv4kaS XFdkhwjrMm17dG1qOO7uEKo6/jAWlktKClkq1lwAjMtSAWGsTAP81OBmsycoj7o0p8cW f7O4JAx8OxqPnSDukMGsk1Y9sELHrvIN/Iae1bmBKKj7aeAC2KX2uZjim2yuixo9rIeq dJMg== X-Gm-Message-State: AOAM531nf0l0KthjQkRfh/g9G2tLcVHjTJmUytB7bwv+L5zR9UugeB12 gtjPc5RwsHdj26TI8L/VhP6DGckh4YeO2g5iLaWu0Ozp0EEwTlR6XM2DnKiOOLvH1CXEqqOXZhr sByjKlRErD0a0JzjOeIMuLqZl50sh/2cHz6NHIvWs+A== X-Received: by 2002:a17:906:1796:: with SMTP id t22mr3342590eje.372.1611332602171; Fri, 22 Jan 2021 08:23:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxqQz8MjU6C3uv4iXgHSPKiJ2RbBgwlSTp1XGqTsmIGVFBpNtK12NVCCuO27Oiuv+0nnDVyvw== X-Received: by 2002:a17:906:1796:: with SMTP id t22mr3342581eje.372.1611332601973; Fri, 22 Jan 2021 08:23:21 -0800 (PST) Received: from localhost ([2001:470:6973:2:cb60:1396:20d7:1932]) by smtp.gmail.com with ESMTPSA id i13sm5710660edu.22.2021.01.22.08.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 08:23:21 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time -- handle Build-Depends Date: Fri, 22 Jan 2021 16:23:05 +0000 Message-Id: <20210122162312.459010-5-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122162312.459010-1-apw@canonical.com> References: <20210122162312.459010-1-apw@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: , Cc: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Andy Whitcroft --- debian/control.common | 5 +---- debian/scripts/gen-rules | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/control.common b/debian/control.common index f877453..024f702 100644 --- a/debian/control.common +++ b/debian/control.common @@ -11,9 +11,6 @@ Build-Depends: dkms, curl, gawk, - linux-headers-@ABI@-generic (>= @VERSION@), - linux-headers-@ABI@-lowlatency (>= @VERSION@), - linux-buildinfo-@ABI@-generic (>= @VERSION@), - linux-buildinfo-@ABI@-lowlatency (>= @VERSION@), + @BUILD-INTERLOCK@ Standards-Version: 3.9.4 Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-restricted-modules/+git/@SERIES@ diff --git a/debian/scripts/gen-rules b/debian/scripts/gen-rules index 2b7a177..f52697d 100755 --- a/debian/scripts/gen-rules +++ b/debian/scripts/gen-rules @@ -2,6 +2,7 @@ mkdir -p "debian/control.d" cat "debian/rules.in" >"debian/rules.gen" +: >"debian/control.gen" : >"debian/control.d/meta-nvidia" : >"debian/control.d/nvidia" : >"debian/control.d/migrate-nvidia" @@ -17,8 +18,8 @@ do targets=$(echo "$archs" | sed -e 's/\>"debian/control.gen" <= @VERSION@), - linux-buildinfo-@ABI@-${flavour} [${archs}] (>= @VERSION@), + linux-headers-@ABI@-${flavour} (>= @VERSION@) [${archs}], + linux-buildinfo-@ABI@-${flavour} (>= @VERSION@) [${archs}], EOL while read package version extra