From patchwork Wed Apr 11 07:31:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 897066 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40LbMJ3qXxz9s1r for ; Wed, 11 Apr 2018 17:31:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EAEC78667E; Wed, 11 Apr 2018 07:31:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cql8v0bHoZJM; Wed, 11 Apr 2018 07:31:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1BFE48688F; Wed, 11 Apr 2018 07:31:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 82C311CF13A for ; Wed, 11 Apr 2018 07:31:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7FB8086490 for ; Wed, 11 Apr 2018 07:31:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bPp4LnJYvQEr for ; Wed, 11 Apr 2018 07:31:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.bootlin.com (mail.bootlin.com [62.4.15.54]) by fraxinus.osuosl.org (Postfix) with ESMTP id A705D8646C for ; Wed, 11 Apr 2018 07:31:35 +0000 (UTC) Received: by mail.bootlin.com (Postfix, from userid 110) id 984852081F; Wed, 11 Apr 2018 09:31:33 +0200 (CEST) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.bootlin.com (Postfix) with ESMTPSA id 6820E20702; Wed, 11 Apr 2018 09:31:23 +0200 (CEST) From: Thomas Petazzoni To: Buildroot List , "Yann E. MORIN" , Maxime Hadjinlian Date: Wed, 11 Apr 2018 09:31:21 +0200 Message-Id: <20180411073121.4621-1-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.14.3 Subject: [Buildroot] [PATCH] support/download/dl-wrapper: fix passing remaining options to helper scripts X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When calling the backend-specific helper scripts, the remaining options are in ${@}. However, in order to let the helper script know that those remaining options should not be parsed, but instead passed as-is to the download tool, they must be separated from the main options by "--". Without this, packages that use _DL_OPTS, such as the amd-catalyst package, cannot download their tarball anymore. Fixes: http://autobuild.buildroot.net/results/de818f6e4c8e63d5e8a49c445d10c34eccc40410/ Signed-off-by: Thomas Petazzoni Tested-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" --- Note: please review carefully. I am not sure this is the right fix. Looking at the history of dl-wrapper, I don't see where this -- was passed before the recent rework, so I'm not sure my solution is correct. --- support/download/dl-wrapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 38430738eb..3d2118a4ef 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -129,7 +129,7 @@ main() { -f "${filename}" \ -u "${uri}" \ -o "${tmpf}" \ - ${quiet} ${recurse} "${@}" + ${quiet} ${recurse} -- "${@}" then # cd back to keep path coherence cd "${OLDPWD}"