From patchwork Fri May 29 14:37:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1300807 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 49YRxl18Wwz9sSr; Sat, 30 May 2020 00:38:03 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jeg91-0005ht-Tk; Fri, 29 May 2020 14:37:59 +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 1jeg90-0005hQ-JF for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:37:58 +0000 Received: from mail-wr1-f69.google.com ([209.85.221.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jeg90-0007l3-9Y for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:37:58 +0000 Received: by mail-wr1-f69.google.com with SMTP id e1so1137582wrm.3 for ; Fri, 29 May 2020 07:37:58 -0700 (PDT) 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=VR/3KUxHNtNDHr2PGlJhIUSRGr4y/T6ihL2rbUIbmIs=; b=Ug5YnGZnAneYBwezhQFjS1NftrRj4ST01lbqi+xQpZlGDskDq4NcVa6xRSV077tq9c XpAwQ3oNZbbxFh8oRmOZY6Xs51j4Ut3iKVX2f+GQKqPh/4yAQhgOZdWDXxevEfT/4tMC 0ZBWo7fQjj2qN/X1tZB1f8Ls3iCAirpMxTcrW4+WEarF6ZpBLmYgPYRfLmqho9Q3Qdg+ H/WvkEgrnt01ZdBABu/SHgJP9mvY4C1jisBxt2GfpupHdg05FHSV7SrtHBr5VX/UxIl4 p4mgxTrl3jUQAXTlehhp69dvJidZMpcVc9df7og8EbmTUnBEST+ZbUJH66wpeU2bCYq4 39Lw== X-Gm-Message-State: AOAM530rX+r7EYqs5+iwEfXRsxPITQlVMyvxhg0NqwZVdolDo2xwVep2 C3l28Vrdr+cdajrlmokzSGxDmBJyxt+l9b7FprK2i/KPBepaIt7akMoJrdMidRk3j1KtKYvCg4a E7c/jyVGrvwWmu1S2iH5BZMSUFg7FpSTtkPcrcfAJcQ== X-Received: by 2002:a05:600c:22c1:: with SMTP id 1mr9262215wmg.50.1590763077755; Fri, 29 May 2020 07:37:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwngTFnShDLrxMWLu97X7cLg86r4IMxPOL1zEunC4rSZb1OW5gltycUZ0r2OIDj4mDRr7VzUg== X-Received: by 2002:a05:600c:22c1:: with SMTP id 1mr9262198wmg.50.1590763077494; Fri, 29 May 2020 07:37:57 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-69.clienti.tiscali.it. [94.34.33.69]) by smtp.gmail.com with ESMTPSA id o6sm10074892wrp.3.2020.05.29.07.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 07:37:57 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/8 B][SRU][L-R-M] UBUNTU: [packaging] fix reproducible builds on ppc64el Date: Fri, 29 May 2020 16:37:46 +0200 Message-Id: <20200529143751.2218526-4-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200529143751.2218526-1-alberto.milone@canonical.com> References: <20200529143751.2218526-1-alberto.milone@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@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" --- debian/scripts/dkms-build--nvidia-N | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/scripts/dkms-build--nvidia-N b/debian/scripts/dkms-build--nvidia-N index 3759232..6598ddd 100755 --- a/debian/scripts/dkms-build--nvidia-N +++ b/debian/scripts/dkms-build--nvidia-N @@ -14,6 +14,7 @@ package="$6" shift 6 build="$( dirname "$objects" )/build" +arch="$( /usr/bin/dpkg-architecture -qDEB_HOST_ARCH )" # Copy over the objects ready for reconstruction. mkdir -p "$pkgdir/bits/scripts" @@ -21,9 +22,17 @@ cp -rp "$objects"/* "$pkgdir/bits" # Install the support files we need. cp "$srcdir/scripts/module-common.lds" "$pkgdir/bits/scripts" -grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" >"$pkgdir/bits/BUILD" -grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" \ - -e 's/.*-o *\([^ ]*\) .*/rm -f \1/g' >"$pkgdir/bits/CLEAN" + +if [ "$arch" = "ppc64el" ]; then + grep /usr/bin/ld.bfd "$log" | grep -v "^ if" | sed -e 's@; *make -f ./arch/powerpc/.*@@' \ + -e "s@$build/@@g" >"$pkgdir/bits/BUILD" + grep /usr/bin/ld.bfd "$log"| grep -v "^ if" | sed -e "s@$build/@@g" \ + -e 's/.*-o *\([^ ]*\) .*/rm -f \1/g' >"$pkgdir/bits/CLEAN" +else + grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" >"$pkgdir/bits/BUILD" + grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" \ + -e 's/.*-o *\([^ ]*\) .*/rm -f \1/g' >"$pkgdir/bits/CLEAN" +fi # As the builds contain the absolute filenames as used. Use RECONSTRUCT to # rebuild the .ko's, sign them, pull off the signatures and then finally clean From patchwork Fri May 29 14:37:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1300812 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 49YRxz6S6bz9sSx; Sat, 30 May 2020 00:38:15 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jeg9C-0005p6-Dj; Fri, 29 May 2020 14:38:10 +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 1jeg94-0005jU-AP for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:38:02 +0000 Received: from mail-wr1-f70.google.com ([209.85.221.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jeg93-0007mB-RA for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:38:01 +0000 Received: by mail-wr1-f70.google.com with SMTP id t5so1114116wro.20 for ; Fri, 29 May 2020 07:38:01 -0700 (PDT) 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=qURar1Asw8K5yurCcb8Rc61UkzO9njtMzMM9S9xdnrs=; b=baZc60ZCxr//v88IdVmaFVy1YkpnGsbZj1sOQbyccLhSjTc3v6xDK0EMOXrmeN/ofZ TjVhu8SYjMUzmi6KttKhRUnjs0fqv1dGEonHY3u9vliLbthMFbDbXWCdfrVtVA4FjJoh baY1N7f4rYVCQNowdS9tmBfvPr2nUjKIol35/nalbyOQKn5bvK54MoGMUBQpmS/GXbra /IOsm7pRGG7mh82Kx2Qtp/X85yRn38CNve3/8l9iHvU37K4AzrmoFiyvwnQVIxptNHYM AMbZ9KGfis9MQtCp+xvSaEl0aCIVqktXGsLc89KO5gQAepq4DeVQVoMwb4lt6un8/Mhc qHxQ== X-Gm-Message-State: AOAM5304EQWhwvGK1MFU3LnIRTjN3pxNc73ebIIp0pjCgQNF2jjPf/sC NpDuiy5GsLNpWnqm7y83R/KaaOMdw5R3A/8BsL5dESqf7CEE3VJHuqOLvECmV5zCehbvvcW8UEZ lj4rixz1As7CVgx93Jifj6likyitKGQOMfruO+M0NDg== X-Received: by 2002:a5d:6444:: with SMTP id d4mr9347120wrw.239.1590763081122; Fri, 29 May 2020 07:38:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxegiL+BSgL729A7r3p0fY8NUb+8tMvu6zI1ekSOjzFAh5K0jpcjEelu+XCgCcwUoerZpyLGg== X-Received: by 2002:a5d:6444:: with SMTP id d4mr9347099wrw.239.1590763080920; Fri, 29 May 2020 07:38:00 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-69.clienti.tiscali.it. [94.34.33.69]) by smtp.gmail.com with ESMTPSA id o6sm10074892wrp.3.2020.05.29.07.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 07:37:59 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/8 B][SRU][L-R-M] UBUNTU: [Packaging] fix-filenames -- build during build phase Date: Fri, 29 May 2020 16:37:49 +0200 Message-Id: <20200529143751.2218526-7-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200529143751.2218526-1-alberto.milone@canonical.com> References: <20200529143751.2218526-1-alberto.milone@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@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Whitcroft Currently we build this during the clean phase which means you end up with a source package build host version not a native version. Build during the dh_prep phase. Signed-off-by: Andy Whitcroft Signed-off-by: Seth Forshee --- debian/rules | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 61f6af2..7e16d56 100755 --- a/debian/rules +++ b/debian/rules @@ -37,9 +37,9 @@ pre-clean: PHONY: pre-clean debian/scripts/fix-filenames: debian/scripts/fix-filenames.c - cc -o $@ $^ + $(CC) -o $@ $^ -clean:: pre-clean debian/scripts/fix-filenames +clean:: pre-clean %: dh $@ @@ -106,5 +106,8 @@ prepare-dkms: mkdir -p $(dkms_dir) ln -s /usr/src $(dkms_dir)/headers +override_dh_prep: debian/scripts/fix-filenames + dh_prep + override_dh_auto_install: prepare-dkms $(flavours) dh_install From patchwork Fri May 29 14:37:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1300808 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 49YRxp6f1tz9sSw; Sat, 30 May 2020 00:38:06 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jeg95-0005jy-4e; Fri, 29 May 2020 14:38:03 +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 1jeg8z-0005ga-0l for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:37:57 +0000 Received: from mail-wr1-f71.google.com ([209.85.221.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jeg8y-0007kY-OF for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:37:56 +0000 Received: by mail-wr1-f71.google.com with SMTP id c14so1122241wrw.11 for ; Fri, 29 May 2020 07:37:56 -0700 (PDT) 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=+0wZrPDxtRqAsRHRhjQ+8+wR1diZaMEgWhjObljl/O4=; b=ulwV/RJPsaI1Xl2p6BXNOPuIykbH1oE7U9lmyYD2CpCN/4znPWdMA0x+iUFWGm6G0C EPsH4/L8kumCwwlNXfZXjK+0Ra3eLXhyqRC9uqcLQm3GvEWHvWeuvjOUSzzwlre2G7g3 cWrQF9B9SFf7lrxjWaXoKQQObTrMgpZs3ozR7tEARPE2C2zTqXB+8iULMDpsuMEr22Mi z7ufIc4v32Vd0RTR3GRkjOgpmC4NmIC5wuR4Pe0lBJMTdW9hfZO7jtUW1RoGZdtIaUNh sPiaeTPEpfiNzfEVLPyMYRureLVBmz2c1tKPP4zMOHVjDF9DeG6LnTpoweb4Xc8z0ysi kmcw== X-Gm-Message-State: AOAM531Pp2QdaT8kgIklbR3PdOwUVFWfdRZDBrCpYCtso/IiJ0DfSBIs pDgozRg+k5/SKpbAruL6I/V4jC6RlcbFBVw6+qP6pRTtoBudShdZ/a3W9dgE9jaz6syRlAJ6Jb/ AUCWf4bJit8I71Tj+1bv4EaIczDoYQStwKj40gnlXjQ== X-Received: by 2002:a7b:c0c8:: with SMTP id s8mr9238687wmh.134.1590763076013; Fri, 29 May 2020 07:37:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkpgz2HfH+7xVk3IfQiyEh+tVtjyKVdneEzpWwneuuYuyjDKIpci8limuu9xOQrB6ocbjCxg== X-Received: by 2002:a7b:c0c8:: with SMTP id s8mr9238651wmh.134.1590763075679; Fri, 29 May 2020 07:37:55 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-69.clienti.tiscali.it. [94.34.33.69]) by smtp.gmail.com with ESMTPSA id o6sm10074892wrp.3.2020.05.29.07.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 07:37:55 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/8 B][SRU][L-R-M] UBUNTU: [packaging] add nvidia 418-server and 440-server drivers Date: Fri, 29 May 2020 16:37:44 +0200 Message-Id: <20200529143751.2218526-2-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200529143751.2218526-1-alberto.milone@canonical.com> References: <20200529143751.2218526-1-alberto.milone@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@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Build the two new drivers for amd64 and ppc64el. --- debian/control.stub | 92 +++++++++++++++++++++++++++++++++++++++++++- debian/dkms-versions | 2 + debian/rules | 23 +++++++++-- 3 files changed, 112 insertions(+), 5 deletions(-) diff --git a/debian/control.stub b/debian/control.stub index 963bab2..91a2aa2 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -13,8 +13,8 @@ Build-Depends: gawk, linux-headers-ABI-generic (>= VERSION), linux-buildinfo-ABI-generic (>= VERSION), - linux-headers-ABI-lowlatency (>= VERSION), - linux-buildinfo-ABI-lowlatency (>= VERSION), + linux-headers-ABI-lowlatency (>= VERSION) [!ppc64el], + linux-buildinfo-ABI-lowlatency (>= VERSION) [!ppc64el], Standards-Version: 3.9.4 Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-restricted-modules/+git/bionic @@ -149,3 +149,91 @@ Section: kernel Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-lowlatency (= ${binary:Version}) Description: Extra drivers for nvidia-440 for the lowlatency flavour Install extra signed nvidia-440 modules compatible with the lowlatency flavour. + +Package: linux-modules-nvidia-418-server-ABI-generic +Build-Profiles: +Architecture: amd64 ppc64el +Section: kernel +Priority: optional +Built-Using: ${linux:BuiltUsing} +Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-generic | linux-image-unsigned-ABI-generic, nvidia-kernel-common-418-server +Description: Linux kernel nvidia modules for version ABI + This package contains the Linux kernel nvidia modules for version ABI. + . + You likely do not want to install this package directly. Instead, install the + linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work + correctly, and that supporting packages are also installed. + +Package: linux-modules-nvidia-418-server-ABI-lowlatency +Build-Profiles: +Architecture: amd64 +Section: kernel +Priority: optional +Built-Using: ${linux:BuiltUsing} +Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-lowlatency | linux-image-unsigned-ABI-lowlatency, nvidia-kernel-common-418-server +Description: Linux kernel nvidia modules for version ABI + This package contains the Linux kernel nvidia modules for version ABI. + . + You likely do not want to install this package directly. Instead, install the + linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work + correctly, and that supporting packages are also installed. + +Package: linux-modules-nvidia-418-server-generic +Build-Profiles: +Architecture: amd64 ppc64el +Section: kernel +Depends: ${misc:Depends}, linux-modules-nvidia-418-server-ABI-generic (= ${binary:Version}) +Description: Extra drivers for nvidia-418-server for the generic flavour + Install extra signed nvidia-418-server modules compatible with the generic flavour. + +Package: linux-modules-nvidia-418-server-lowlatency +Build-Profiles: +Architecture: amd64 +Section: kernel +Depends: ${misc:Depends}, linux-modules-nvidia-418-server-ABI-lowlatency (= ${binary:Version}) +Description: Extra drivers for nvidia-418-server for the lowlatency flavour + Install extra signed nvidia-418-server modules compatible with the lowlatency flavour. + +Package: linux-modules-nvidia-440-server-ABI-generic +Build-Profiles: +Architecture: amd64 ppc64el +Section: kernel +Priority: optional +Built-Using: ${linux:BuiltUsing} +Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-generic | linux-image-unsigned-ABI-generic, nvidia-kernel-common-440-server +Description: Linux kernel nvidia modules for version ABI + This package contains the Linux kernel nvidia modules for version ABI. + . + You likely do not want to install this package directly. Instead, install the + linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work + correctly, and that supporting packages are also installed. + +Package: linux-modules-nvidia-440-server-ABI-lowlatency +Build-Profiles: +Architecture: amd64 +Section: kernel +Priority: optional +Built-Using: ${linux:BuiltUsing} +Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-lowlatency | linux-image-unsigned-ABI-lowlatency, nvidia-kernel-common-440-server +Description: Linux kernel nvidia modules for version ABI + This package contains the Linux kernel nvidia modules for version ABI. + . + You likely do not want to install this package directly. Instead, install the + linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work + correctly, and that supporting packages are also installed. + +Package: linux-modules-nvidia-440-server-generic +Build-Profiles: +Architecture: amd64 ppc64el +Section: kernel +Depends: ${misc:Depends}, linux-modules-nvidia-440-server-ABI-generic (= ${binary:Version}) +Description: Extra drivers for nvidia-440-server for the generic flavour + Install extra signed nvidia-440-server modules compatible with the generic flavour. + +Package: linux-modules-nvidia-440-server-lowlatency +Build-Profiles: +Architecture: amd64 +Section: kernel +Depends: ${misc:Depends}, linux-modules-nvidia-440-server-ABI-lowlatency (= ${binary:Version}) +Description: Extra drivers for nvidia-440-server for the lowlatency flavour + Install extra signed nvidia-440-server modules compatible with the lowlatency flavour. diff --git a/debian/dkms-versions b/debian/dkms-versions index c830a65..67b57f3 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -3,3 +3,5 @@ zfs-linux 0.7.5-1ubuntu16.8 nvidia-graphics-drivers-390 390.132-0ubuntu0.18.04.1 nvidia-graphics-drivers-435 435.21-0ubuntu0.18.04.2 nvidia-graphics-drivers-440 440.59-0ubuntu0.18.04.1 +nvidia-graphics-drivers-418-server 0 +nvidia-graphics-drivers-440-server 0 diff --git a/debian/rules b/debian/rules index 7e16d56..6552b42 100755 --- a/debian/rules +++ b/debian/rules @@ -13,9 +13,11 @@ src_fullversion = $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d src_abi = $(shell echo "$(src_fullversion)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*//') -dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390/ { print $$2; }' debian/dkms-versions) -dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { print $$2; }' debian/dkms-versions) -dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { print $$2; }' debian/dkms-versions) +dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390 / { print $$2; }' debian/dkms-versions) +dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435 / { print $$2; }' debian/dkms-versions) +dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440 / { print $$2; }' debian/dkms-versions) +dkms_nvidia_418_server_version=$(shell gawk '/^nvidia-graphics-drivers-418-server / { print $$2; }' debian/dkms-versions) +dkms_nvidia_440_server_version=$(shell gawk '/^nvidia-graphics-drivers-440-server / { print $$2; }' debian/dkms-versions) test: echo "$(src_fullversion) $(src_version)" @@ -87,6 +89,8 @@ flavours=$(patsubst /usr/lib/linux/$(src_abi)-%,nvidia-%,$(signatures)) nvidia-%: rm -rf $(dkms_dir)/build $(dkms_dir)/source mkdir -p $(dkms_dir)/build $(dkms_dir)/source + +ifeq ($(arch),amd64) install -d debian/linux-modules-nvidia-390-$(src_abi)-$* install -d debian/linux-modules-nvidia-390-$(src_abi)-$*/usr/lib/linux/triggers $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-390-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-390-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, nvidia-390, pool/restricted/n/nvidia-graphics-drivers-390/nvidia-kernel-source-390_$(dkms_nvidia_390_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-390/nvidia-dkms-390_$(dkms_nvidia_390_version)_$(arch).deb) @@ -101,6 +105,19 @@ nvidia-%: install -d debian/linux-modules-nvidia-440-$(src_abi)-$*/usr/lib/linux/triggers $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, nvidia-440, pool/restricted/n/nvidia-graphics-drivers-440/nvidia-kernel-source-440_$(dkms_nvidia_440_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440/nvidia-dkms-440_$(dkms_nvidia_440_version)_$(arch).deb) $(call install_control,linux-modules-nvidia-440-$(src_abi)-$*,$*,nvidia,440,postinst postrm prerm config templates) +endif + +ifneq (,$(filter $(arch),amd64 ppc64el)) + install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$* + install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-418-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-418-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, nvidia-418srv, pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-kernel-source-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-dkms-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-418-server-$(src_abi)-$*,$*,nvidia,418srv,postinst postrm prerm config templates) + + install -d debian/linux-modules-nvidia-440-server-$(src_abi)-$* + install -d debian/linux-modules-nvidia-440-server-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, nvidia-440srv, pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-kernel-source-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-dkms-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-440-server-$(src_abi)-$*,$*,nvidia,440srv,postinst postrm prerm config templates) +endif prepare-dkms: mkdir -p $(dkms_dir) From patchwork Fri May 29 14:37:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1300809 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 49YRxr01d7z9sSx; Sat, 30 May 2020 00:38:08 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jeg95-0005kn-Jk; Fri, 29 May 2020 14:38:03 +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 1jeg92-0005iR-Ow for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:38:00 +0000 Received: from mail-wm1-f72.google.com ([209.85.128.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jeg92-0007lM-7v for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:38:00 +0000 Received: by mail-wm1-f72.google.com with SMTP id p24so776315wmc.1 for ; Fri, 29 May 2020 07:38:00 -0700 (PDT) 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=UeypRTUwbTs3BjMoLmaO9uLRA/fficyhuGNgPwdsmRw=; b=odkRkNYo5ypWKZsnZzjLONdrW5FoNQHMBIFG6IfbI79EN8HqJOhWNAeXmfmFjI65i7 Hsr0KDqSKDc8W6CEvaDVR8w49kqXsr+e9mZxk+x4bqwmzISuIyGg1OifgFMaXyNHZ+7g ZRpwzLrycfooIFKfv1v8OF3PkbFYLoUE7fZIGgr56HsWhfmzuhSA0ARO6TqGTnoCq1UE 30id8lQyqxCnch/UmEqwuYuWcuq0pv1a9UTgXgTjQl1qMdWNB8zPXN6YvyWvT4foe47H FJ3hRIx7zJJNWSjobOmE1Es4xd/XZPEnuazYsiKSC23dHq9Fg//Lz14BtHOqfkawWRtw H2MQ== X-Gm-Message-State: AOAM533NJpu5tEjFcuB2qwxjPrbqBjRcSkxgVrABWSKUbW+m3IdohsDp LqEaG7xIdDtNFAFbnle33FlSTf2MbZxo1Leu3kb58ZTg6lUY6eeiqFV/xsHozz+LwyjFAQ8A2nH TO0qjNR14aWVBErwkOeeURoOBSmfWnrAjp+cz4ETOPA== X-Received: by 2002:a05:600c:4146:: with SMTP id h6mr9254912wmm.170.1590763079754; Fri, 29 May 2020 07:37:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwi2NpCAI65q5PdOPn4LG6GjtXLXfepM5NhFkc0tsJYkjAMXRllfSxSUyeDwsGJqcrewIqvOg== X-Received: by 2002:a05:600c:4146:: with SMTP id h6mr9254836wmm.170.1590763078638; Fri, 29 May 2020 07:37:58 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-69.clienti.tiscali.it. [94.34.33.69]) by smtp.gmail.com with ESMTPSA id o6sm10074892wrp.3.2020.05.29.07.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 07:37:58 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/8 B][SRU][L-R-M] UBUNTU: [Packaging] rules -- expose dkms provides data Date: Fri, 29 May 2020 16:37:47 +0200 Message-Id: <20200529143751.2218526-5-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200529143751.2218526-1-alberto.milone@canonical.com> References: <20200529143751.2218526-1-alberto.milone@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@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Whitcroft Export the dkms provides data for use in control templates. This is based on Andy's work on LP: #1856414. BugLink: https://bugs.launchpad.net/bugs/1856414 --- debian/rules | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/rules b/debian/rules index 6552b42..799f338 100755 --- a/debian/rules +++ b/debian/rules @@ -128,3 +128,12 @@ override_dh_prep: debian/scripts/fix-filenames override_dh_auto_install: prepare-dkms $(flavours) dh_install + +gencontrol_flags = -Vdkms:nvidia-390-modules="nvidia-dkms-390 (= $(dkms_nvidia_390_version))" +gencontrol_flags += -Vdkms:nvidia-435-modules="nvidia-dkms-435 (= $(dkms_nvidia_435_version))" +gencontrol_flags += -Vdkms:nvidia-440-modules="nvidia-dkms-440 (= $(dkms_nvidia_440_version))" +gencontrol_flags += -Vdkms:nvidia-418-server-modules="nvidia-dkms-418-server (= $(dkms_nvidia_418_server_version))" +gencontrol_flags += -Vdkms:nvidia-440-server-modules="nvidia-dkms-440-server (= $(dkms_nvidia_440_server_version))" + +override_dh_gencontrol: + dh_gencontrol -- $(gencontrol_flags) From patchwork Fri May 29 14:37:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1300813 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 49YRy20rtHz9sSn; Sat, 30 May 2020 00:38:18 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jeg9F-0005sf-Qh; Fri, 29 May 2020 14:38:13 +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 1jeg95-0005kT-Kg for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:38:03 +0000 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jeg95-0007mU-9i for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:38:03 +0000 Received: by mail-wm1-f69.google.com with SMTP id k185so885842wme.8 for ; Fri, 29 May 2020 07:38:03 -0700 (PDT) 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=FgnFWsfwmEpspX/jDXa9JcgP8frC7cNQxEXhXa7Qpy0=; b=ezc1hUr+37F5DFH/6STqOlrB6xTvyZp7ZJrNAmAC/V+ZRCjfAIfze5OO52LDG54G48 MkjuIZmYBjanxCHisjiPiqS3NioK6bFE443INkmb0BkEgiqU974w1w3o7zbPAyy537Rz 4qH2eiLZcdYCGU5U6qgSjUGY0iKM4VsQDLmvLlq5iMQZvjY5dZ2ueDaxATy6nlmK7poX yaLdqBtYu9TDIqI+tirKvkVAZlGMskw4hUoPK/9FV+rzM3QLolBQUFMqfD/BsCinr2aX cg6OoyyN3q1TmZNoi0k7K0DGNoLBA+nEI8y5DRCIdzp1NDpEYKUwRLG5gF1skz7lp1BI ZX/g== X-Gm-Message-State: AOAM531i9rVLiL9ulg5TdRnWNxRIJ9TKM66x9429AeoWPcHWKh7JefZh 7mWc/SQUsF6c4tazikxZxX6nfbngLB3gmHzMncvJE/SYc9rZW+BmVqljI5UhlcRACOJCx/80osq Rb32edtZvQlIUcdF95iZmFRajjfm6j7z/05RGEWq72g== X-Received: by 2002:a5d:6884:: with SMTP id h4mr9661547wru.198.1590763082461; Fri, 29 May 2020 07:38:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJEXyUCL0IptDHKS2pI/MqpNAMWBU47WiaylY+eyzQ14XNo39ene1h9DrU4GL/fP9+UcTmAw== X-Received: by 2002:a5d:6884:: with SMTP id h4mr9661531wru.198.1590763082225; Fri, 29 May 2020 07:38:02 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-69.clienti.tiscali.it. [94.34.33.69]) by smtp.gmail.com with ESMTPSA id o6sm10074892wrp.3.2020.05.29.07.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 07:38:01 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/8 B][SRU][L-R-M] UBUNTU: [Config] expose provides information on meta packages Date: Fri, 29 May 2020 16:37:50 +0200 Message-Id: <20200529143751.2218526-8-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200529143751.2218526-1-alberto.milone@canonical.com> References: <20200529143751.2218526-1-alberto.milone@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@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Expose the various provides data on the meta-packages. BugLink: https://bugs.launchpad.net/bugs/1856414 --- debian/control.stub | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/control.stub b/debian/control.stub index 91a2aa2..2165c57 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -50,6 +50,7 @@ Package: linux-modules-nvidia-390-generic Build-Profiles: Architecture: amd64 Section: kernel +Provides: ${dkms:nvidia-390-modules} Depends: ${misc:Depends}, linux-modules-nvidia-390-ABI-generic (= ${binary:Version}) Description: Extra drivers for nvidia-390 for the generic flavour Install extra signed nvidia-390 modules compatible with the generic flavour. @@ -58,6 +59,7 @@ Package: linux-modules-nvidia-390-lowlatency Build-Profiles: Architecture: amd64 Section: kernel +Provides: ${dkms:nvidia-390-modules} Depends: ${misc:Depends}, linux-modules-nvidia-390-ABI-lowlatency (= ${binary:Version}) Description: Extra drivers for nvidia-390 for the lowlatency flavour Install extra signed nvidia-390 modules compatible with the lowlatency flavour. @@ -94,6 +96,7 @@ Package: linux-modules-nvidia-435-generic Build-Profiles: Architecture: amd64 Section: kernel +Provides: ${dkms:nvidia-435-modules} Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-generic (= ${binary:Version}) Description: Extra drivers for nvidia-435 for the generic flavour Install extra signed nvidia-435 modules compatible with the generic flavour. @@ -102,6 +105,7 @@ Package: linux-modules-nvidia-435-lowlatency Build-Profiles: Architecture: amd64 Section: kernel +Provides: ${dkms:nvidia-435-modules} Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-lowlatency (= ${binary:Version}) Description: Extra drivers for nvidia-435 for the lowlatency flavour Install extra signed nvidia-435 modules compatible with the lowlatency flavour. @@ -138,6 +142,7 @@ Package: linux-modules-nvidia-440-generic Build-Profiles: Architecture: amd64 Section: kernel +Provides: ${dkms:nvidia-440-modules} Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-generic (= ${binary:Version}) Description: Extra drivers for nvidia-440 for the generic flavour Install extra signed nvidia-440 modules compatible with the generic flavour. @@ -146,6 +151,7 @@ Package: linux-modules-nvidia-440-lowlatency Build-Profiles: Architecture: amd64 Section: kernel +Provides: ${dkms:nvidia-440-modules} Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-lowlatency (= ${binary:Version}) Description: Extra drivers for nvidia-440 for the lowlatency flavour Install extra signed nvidia-440 modules compatible with the lowlatency flavour. @@ -182,6 +188,7 @@ Package: linux-modules-nvidia-418-server-generic Build-Profiles: Architecture: amd64 ppc64el Section: kernel +Provides: ${dkms:nvidia-418-server-modules} Depends: ${misc:Depends}, linux-modules-nvidia-418-server-ABI-generic (= ${binary:Version}) Description: Extra drivers for nvidia-418-server for the generic flavour Install extra signed nvidia-418-server modules compatible with the generic flavour. @@ -190,6 +197,7 @@ Package: linux-modules-nvidia-418-server-lowlatency Build-Profiles: Architecture: amd64 Section: kernel +Provides: ${dkms:nvidia-418-server-modules} Depends: ${misc:Depends}, linux-modules-nvidia-418-server-ABI-lowlatency (= ${binary:Version}) Description: Extra drivers for nvidia-418-server for the lowlatency flavour Install extra signed nvidia-418-server modules compatible with the lowlatency flavour. @@ -226,6 +234,7 @@ Package: linux-modules-nvidia-440-server-generic Build-Profiles: Architecture: amd64 ppc64el Section: kernel +Provides: ${dkms:nvidia-440-server-modules} Depends: ${misc:Depends}, linux-modules-nvidia-440-server-ABI-generic (= ${binary:Version}) Description: Extra drivers for nvidia-440-server for the generic flavour Install extra signed nvidia-440-server modules compatible with the generic flavour. @@ -234,6 +243,7 @@ Package: linux-modules-nvidia-440-server-lowlatency Build-Profiles: Architecture: amd64 Section: kernel +Provides: ${dkms:nvidia-440-server-modules} Depends: ${misc:Depends}, linux-modules-nvidia-440-server-ABI-lowlatency (= ${binary:Version}) Description: Extra drivers for nvidia-440-server for the lowlatency flavour Install extra signed nvidia-440-server modules compatible with the lowlatency flavour. From patchwork Fri May 29 14:37:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1300810 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 49YRxs0zKtz9sSy; Sat, 30 May 2020 00:38:09 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jeg96-0005lL-DF; Fri, 29 May 2020 14:38:04 +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 1jeg8z-0005gz-WA for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:37:57 +0000 Received: from mail-wm1-f70.google.com ([209.85.128.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jeg8z-0007kq-MT for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:37:57 +0000 Received: by mail-wm1-f70.google.com with SMTP id j128so771060wmj.6 for ; Fri, 29 May 2020 07:37:57 -0700 (PDT) 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=oBfKZ8swcJvT256APz4KVI/AS7UeffY4fMdBu4r6zL4=; b=RGPFudYwv2u8lQOlZU50ZJpHGYsKUgiLRiq4a3xiF8oM7m3NO0OfGHSiGh4BFRGHxx q4Pp0zHu/+fRTz2PK/Jnwpp16u/JnVqSACfTvs2orTrBLiftq12sRGj1RTgjJ+cC7sxY B94jDzOTahMaLH4E9c5ZCJmr5s4jd2PtYkBXcWDn7dfe6sAopnA8KKAnl7VkgVfBSzsY rNrPdJGCkdhGUYXvpG/y0qE1L9hMTkz9a+EWlDJyGUi+tojTZvMDgfSYs+ABdbV+bR9K d1b54PVFC4Gjs+GtlrF23siGv7wdoLf+HXr3f3xMmZteXauQ/s5QKzVTwYuPhZourzVg 1hNg== X-Gm-Message-State: AOAM531Kiwey9RJixpNxjY53nzLP8T24fZAuRoPTIdOW6E0Im3yHSHeU ZkpXrjnPb7rxJDyClGyb3aPh4Exi0Ek+CeBKS43jtNM5mn+8Hc5ajos7qOPho/m9x1XOYBDulao 6gzVSgbAtlY7wwKhOyj7ugZULEl4dM/kbZ4BTI7TvuQ== X-Received: by 2002:a05:600c:1084:: with SMTP id e4mr9234675wmd.144.1590763076855; Fri, 29 May 2020 07:37:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxeoV/zefmRsJkgB7/CVxUEb+0FR8/6KgigZHgnK35J7qakpaRuI+ztoAFFacQG9hqnl10Gg== X-Received: by 2002:a05:600c:1084:: with SMTP id e4mr9234662wmd.144.1590763076641; Fri, 29 May 2020 07:37:56 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-69.clienti.tiscali.it. [94.34.33.69]) by smtp.gmail.com with ESMTPSA id o6sm10074892wrp.3.2020.05.29.07.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 07:37:56 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/8 B][SRU][L-R-M] UBUNTU: [Packaging] rules -- expose nvidia-kernel-common dependency data Date: Fri, 29 May 2020 16:37:45 +0200 Message-Id: <20200529143751.2218526-3-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200529143751.2218526-1-alberto.milone@canonical.com> References: <20200529143751.2218526-1-alberto.milone@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@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Export the dependency data for use in control templates. --- debian/rules | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/rules b/debian/rules index 799f338..6d3dd69 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,12 @@ dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440 / { print $$ dkms_nvidia_418_server_version=$(shell gawk '/^nvidia-graphics-drivers-418-server / { print $$2; }' debian/dkms-versions) dkms_nvidia_440_server_version=$(shell gawk '/^nvidia-graphics-drivers-440-server / { print $$2; }' debian/dkms-versions) +nvidia_390_upstream_version=$(shell echo "$(dkms_nvidia_390_version)" | cut -d '-' -f 1) +nvidia_435_upstream_version=$(shell echo "$(dkms_nvidia_435_version)" | cut -d '-' -f 1) +nvidia_440_upstream_version=$(shell echo "$(dkms_nvidia_440_version)" | cut -d '-' -f 1) +nvidia_418_server_upstream_version=$(shell echo "$(dkms_nvidia_418_server_version)" | cut -d '-' -f 1) +nvidia_440_server_upstream_version=$(shell echo "$(dkms_nvidia_440_server_version)" | cut -d '-' -f 1) + test: echo "$(src_fullversion) $(src_version)" @@ -135,5 +141,11 @@ gencontrol_flags += -Vdkms:nvidia-440-modules="nvidia-dkms-440 (= $(dkms_nvidia_ gencontrol_flags += -Vdkms:nvidia-418-server-modules="nvidia-dkms-418-server (= $(dkms_nvidia_418_server_version))" gencontrol_flags += -Vdkms:nvidia-440-server-modules="nvidia-dkms-440-server (= $(dkms_nvidia_440_server_version))" +gencontrol_flags += -Vnvk:nvidia-390="nvidia-kernel-common-390 (<= $(nvidia_390_upstream_version)-1), nvidia-kernel-common-390 (>= $(nvidia_390_upstream_version))" +gencontrol_flags += -Vnvk:nvidia-435="nvidia-kernel-common-435 (<= $(nvidia_435_upstream_version)-1), nvidia-kernel-common-435 (>= $(nvidia_435_upstream_version))" +gencontrol_flags += -Vnvk:nvidia-440="nvidia-kernel-common-440 (<= $(nvidia_440_upstream_version)-1), nvidia-kernel-common-440 (>= $(nvidia_440_upstream_version))" +gencontrol_flags += -Vnvk:nvidia-418-server="nvidia-kernel-common-418-server (<= $(nvidia_418_server_upstream_version)-1), nvidia-kernel-common-418-server (>= $(nvidia_418_server_upstream_version))" +gencontrol_flags += -Vnvk:nvidia-440-server="nvidia-kernel-common-440-server (<= $(nvidia_440_server_upstream_version)-1), nvidia-kernel-common-440-server (>= $(nvidia_440_server_upstream_version))" + override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags) From patchwork Fri May 29 14:37:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1300811 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 49YRxw2PgCz9sSn; Sat, 30 May 2020 00:38:12 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jeg9A-0005nr-EB; Fri, 29 May 2020 14:38:08 +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 1jeg92-0005iU-TY for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:38:00 +0000 Received: from mail-wm1-f71.google.com ([209.85.128.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jeg92-0007lb-IL for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:38:00 +0000 Received: by mail-wm1-f71.google.com with SMTP id s15so770966wmc.8 for ; Fri, 29 May 2020 07:38:00 -0700 (PDT) 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=9smOcFEhWv6m0pD0grtQwRx6cCayNoVA86+0OICY1sI=; b=RP1As8DkhA0ZbnQkmGApLytJ1GJBrBbYpXBI0zn6Nr1rsYAKWmF/RN6hjIXcOZOkwk x8qTIFmWwQ6j4TSy+I4RedRhfXn10bgqQ+aO4xtEcrA6btobq+JXqIUKdbpNBcSz/UFw DbIOVLwDAEHZkGckUSKp4pFw74sagyHcYBXG3A0A8MUnkibIttW3r5uTKJgo8c3hw7jA ji5YSVORht+b5cKZwQODmH6SsMLAT2MgeRc9a/r/SwDvjgHaWL11GiIQDjKoeqiatsuh AvJ7s8b50KUUAax52E27PTqGurzes2H7RfhG74yRDPmOa62keDVvayK5IsDlUxbDHYzL Gcsg== X-Gm-Message-State: AOAM530R0HmVx3qge9p4ZzMh2yLtffsrlDAi52H7xHnr5dHh12z28avV wPHcp3amic1qrnB6g0o5od2RcRCfhnP80R+U+N+S3dW+uW5GRjRJkXMVFNQSB5fzbXxfTWKiGj0 lO6ewKQOVqfv8MDe6sNrKoH9qQc2awlaOoCb2doBEhg== X-Received: by 2002:a05:600c:297:: with SMTP id 23mr9329427wmk.12.1590763079811; Fri, 29 May 2020 07:37:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXydFiYFj/se8VX3WVQTSzpjCYfL6QIdIvDiljpOsr9am4woZRW3Q7J0wRHJsxClA9StFc5A== X-Received: by 2002:a05:600c:297:: with SMTP id 23mr9329407wmk.12.1590763079578; Fri, 29 May 2020 07:37:59 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-69.clienti.tiscali.it. [94.34.33.69]) by smtp.gmail.com with ESMTPSA id o6sm10074892wrp.3.2020.05.29.07.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 07:37:59 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 7/8 B][SRU][L-R-M] UBUNTU: [packaging] expose dependency on nvidia-kernel-common on meta packages Date: Fri, 29 May 2020 16:37:48 +0200 Message-Id: <20200529143751.2218526-6-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200529143751.2218526-1-alberto.milone@canonical.com> References: <20200529143751.2218526-1-alberto.milone@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@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Expose the dependency data on nvidia-kernel-common on the meta-packages. --- debian/control.stub | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/debian/control.stub b/debian/control.stub index 2165c57..73a7b55 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -51,7 +51,8 @@ Build-Profiles: Architecture: amd64 Section: kernel Provides: ${dkms:nvidia-390-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-390-ABI-generic (= ${binary:Version}) +Depends: ${misc:Depends}, linux-modules-nvidia-390-ABI-generic (= ${binary:Version}), + ${nvk:nvidia-390} Description: Extra drivers for nvidia-390 for the generic flavour Install extra signed nvidia-390 modules compatible with the generic flavour. @@ -60,7 +61,8 @@ Build-Profiles: Architecture: amd64 Section: kernel Provides: ${dkms:nvidia-390-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-390-ABI-lowlatency (= ${binary:Version}) +Depends: ${misc:Depends}, linux-modules-nvidia-390-ABI-lowlatency (= ${binary:Version}), + ${nvk:nvidia-390} Description: Extra drivers for nvidia-390 for the lowlatency flavour Install extra signed nvidia-390 modules compatible with the lowlatency flavour. @@ -97,7 +99,8 @@ Build-Profiles: Architecture: amd64 Section: kernel Provides: ${dkms:nvidia-435-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-generic (= ${binary:Version}) +Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-generic (= ${binary:Version}), + ${nvk:nvidia-435} Description: Extra drivers for nvidia-435 for the generic flavour Install extra signed nvidia-435 modules compatible with the generic flavour. @@ -106,7 +109,8 @@ Build-Profiles: Architecture: amd64 Section: kernel Provides: ${dkms:nvidia-435-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-lowlatency (= ${binary:Version}) +Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-lowlatency (= ${binary:Version}), + ${nvk:nvidia-435} Description: Extra drivers for nvidia-435 for the lowlatency flavour Install extra signed nvidia-435 modules compatible with the lowlatency flavour. @@ -143,7 +147,8 @@ Build-Profiles: Architecture: amd64 Section: kernel Provides: ${dkms:nvidia-440-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-generic (= ${binary:Version}) +Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-generic (= ${binary:Version}), + ${nvk:nvidia-440} Description: Extra drivers for nvidia-440 for the generic flavour Install extra signed nvidia-440 modules compatible with the generic flavour. @@ -152,7 +157,8 @@ Build-Profiles: Architecture: amd64 Section: kernel Provides: ${dkms:nvidia-440-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-lowlatency (= ${binary:Version}) +Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-lowlatency (= ${binary:Version}), + ${nvk:nvidia-440} Description: Extra drivers for nvidia-440 for the lowlatency flavour Install extra signed nvidia-440 modules compatible with the lowlatency flavour. @@ -189,7 +195,8 @@ Build-Profiles: Architecture: amd64 ppc64el Section: kernel Provides: ${dkms:nvidia-418-server-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-418-server-ABI-generic (= ${binary:Version}) +Depends: ${misc:Depends}, linux-modules-nvidia-418-server-ABI-generic (= ${binary:Version}), + ${nvk:nvidia-418-server} Description: Extra drivers for nvidia-418-server for the generic flavour Install extra signed nvidia-418-server modules compatible with the generic flavour. @@ -198,7 +205,8 @@ Build-Profiles: Architecture: amd64 Section: kernel Provides: ${dkms:nvidia-418-server-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-418-server-ABI-lowlatency (= ${binary:Version}) +Depends: ${misc:Depends}, linux-modules-nvidia-418-server-ABI-lowlatency (= ${binary:Version}), + ${nvk:nvidia-418-server} Description: Extra drivers for nvidia-418-server for the lowlatency flavour Install extra signed nvidia-418-server modules compatible with the lowlatency flavour. @@ -235,7 +243,8 @@ Build-Profiles: Architecture: amd64 ppc64el Section: kernel Provides: ${dkms:nvidia-440-server-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-440-server-ABI-generic (= ${binary:Version}) +Depends: ${misc:Depends}, linux-modules-nvidia-440-server-ABI-generic (= ${binary:Version}), + ${nvk:nvidia-440-server} Description: Extra drivers for nvidia-440-server for the generic flavour Install extra signed nvidia-440-server modules compatible with the generic flavour. @@ -244,6 +253,7 @@ Build-Profiles: Architecture: amd64 Section: kernel Provides: ${dkms:nvidia-440-server-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-440-server-ABI-lowlatency (= ${binary:Version}) +Depends: ${misc:Depends}, linux-modules-nvidia-440-server-ABI-lowlatency (= ${binary:Version}), + ${nvk:nvidia-440-server} Description: Extra drivers for nvidia-440-server for the lowlatency flavour Install extra signed nvidia-440-server modules compatible with the lowlatency flavour. From patchwork Fri May 29 14:37:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1300814 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 49YRy56j7Nz9sSw; Sat, 30 May 2020 00:38:21 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jeg9J-0005vD-CO; Fri, 29 May 2020 14:38:17 +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 1jeg97-0005lU-BK for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:38:05 +0000 Received: from mail-wm1-f70.google.com ([209.85.128.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jeg95-0007mb-VI for kernel-team@lists.ubuntu.com; Fri, 29 May 2020 14:38:04 +0000 Received: by mail-wm1-f70.google.com with SMTP id p24so776370wmc.1 for ; Fri, 29 May 2020 07:38:03 -0700 (PDT) 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=CvVe715a+jFnIXjSbs3jki7z+B3L6fvuY8yr69X7l5A=; b=St4B2CrF6dyUlknz9iI945gj4hrwNegEGrNevq6ZBVvDBZq0xgGMziyxv9yjG60cT8 uTAReRHXwwiMJzfNDhymKLzdVm5Av94jVxlmg6GQaCKt9pcmybcNK6hPMyLhmur2JLcH FAy/KnDg0P7ys7p+MuODoDs0Wo2w+TzH5p+TJn2pymhwOEpSUmlNNUryogLaLhe/w0RC YfGOmwXV9lozZLs0tvsWIt4kfBuIAeCOaNI5iWyhy6eeqhzXBhrpJmBWhnIATob04yF0 DGlgx0e/YLtGQv5vAO6rmvc6XaupAbdwFnUlyzSo6uSaoT1u9a2mtbF8ZqwEva5Ivzvh 9iGw== X-Gm-Message-State: AOAM532rA/PClh/Z7ykaB+arP+awFv/OuSJp66G6QQXG8hGOFFijoJSk N41S8Ly/iv9TcVQ/LKroGbXqxKkR1N9jGy5xqtRsVA0W/DGZqAxdkyRjP77qIh+KioJ4qWk+hWP eDj2RK1lmj483BffFhDRiZGlJu2Cq0Ikj9fgDuq7TrQ== X-Received: by 2002:a1c:7e52:: with SMTP id z79mr9256129wmc.104.1590763083484; Fri, 29 May 2020 07:38:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkaNIgcYCd5EPO8UQ7m08aNZk+iJzBQWPh2W3IKWPjREl9jGMvqyq2ZIVA9OgMLRg8qAqTAQ== X-Received: by 2002:a1c:7e52:: with SMTP id z79mr9256110wmc.104.1590763083288; Fri, 29 May 2020 07:38:03 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-69.clienti.tiscali.it. [94.34.33.69]) by smtp.gmail.com with ESMTPSA id o6sm10074892wrp.3.2020.05.29.07.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 07:38:02 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 8/8 B][SRU][L-R-M] UBUNTU: [Packaging] file-downloader not handling positive failures correctly Date: Fri, 29 May 2020 16:37:51 +0200 Message-Id: <20200529143751.2218526-9-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200529143751.2218526-1-alberto.milone@canonical.com> References: <20200529143751.2218526-1-alberto.milone@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@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Whitcroft Seems we are not handling positive failures such as 404 correctly. Add --fail to get server reported errors converted into errors. BugLink: https://bugs.launchpad.net/bugs/1878897 Signed-off-by: Andy Whitcroft --- debian/scripts/file-downloader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/scripts/file-downloader b/debian/scripts/file-downloader index 46ae962..0ebfb4d 100755 --- a/debian/scripts/file-downloader +++ b/debian/scripts/file-downloader @@ -20,7 +20,7 @@ do echo "II: $what $url" - curl --silent --show-error "$url" -o "$to" -D "$to.hdr" || exit 1 + curl --silent --fail --show-error "$url" -o "$to" -D "$to.hdr" || exit 1 redirect=$(awk '/^Location: / {gsub(/^[[:space:]]+|[[:space:]]+$/,"",$2); print $2;}' "$to.hdr") [ -z "$redirect" ] && break what=' following'