From patchwork Tue Mar 12 15:57:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1055495 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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 44JfkM24jBz9s4V; Wed, 13 Mar 2019 02:57:31 +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 1h3jmM-0005yQ-Sx; Tue, 12 Mar 2019 15:57:22 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1h3jmL-0005y0-Eb for kernel-team@lists.ubuntu.com; Tue, 12 Mar 2019 15:57:21 +0000 Received: from 1.general.apw.uk.vpn ([10.172.192.78] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1h3jmL-00059d-3G; Tue, 12 Mar 2019 15:57:21 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [disco/master-next 1/9] UBUNTU: [Packaging] dkms-build -- support building against packages in PPAs Date: Tue, 12 Mar 2019 15:57:11 +0000 Message-Id: <20190312155719.3532-2-apw@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155719.3532-1-apw@canonical.com> References: <20190312155719.3532-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" PPAs do not really support components. This means everything is published into the main component in their pool. Check both the real component and main when searching. BugLink: http://bugs.launchpad.net/bugs/1764792 Signed-off-by: Andy Whitcroft --- debian/scripts/dkms-build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/scripts/dkms-build b/debian/scripts/dkms-build index 16c041ca1cea..71351a58a17b 100755 --- a/debian/scripts/dkms-build +++ b/debian/scripts/dkms-build @@ -45,7 +45,11 @@ do } ') do - wget "$pool/$package_path" && break || true + url="$pool/$package_path" + wget "$url" && break || true + # No components in PPAs. + url=$(echo "$url" | sed -e 's@/pool/[^/]*/@/pool/main/@') + wget "$url" && break || true done ;; http*:*)