From patchwork Wed Sep 16 01:05:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 24165 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9243E27BBE8; Wed, 16 Sep 2020 02:06:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5D95F27BBE7 for ; Wed, 16 Sep 2020 02:06:09 +0100 (BST) Received: from localhost ([::1]:46072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kILtg-0006qX-Fm for patchwork@mira.cbaines.net; Tue, 15 Sep 2020 21:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kILta-0006q3-Jg for guix-patches@gnu.org; Tue, 15 Sep 2020 21:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kILta-0004DW-AC for guix-patches@gnu.org; Tue, 15 Sep 2020 21:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kILta-0002rR-5H for guix-patches@gnu.org; Tue, 15 Sep 2020 21:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43438] [PATCH] gnu: Fix fetching the linux-libre deblobbing script. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Sep 2020 01:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43438 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43438@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160021835410977 (code B ref -1); Wed, 16 Sep 2020 01:06:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Sep 2020 01:05:54 +0000 Received: from localhost ([127.0.0.1]:60970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kILtS-0002qz-Er for submit@debbugs.gnu.org; Tue, 15 Sep 2020 21:05:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:40702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kILtP-0002qp-MS for submit@debbugs.gnu.org; Tue, 15 Sep 2020 21:05:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kILtP-0006og-HR for guix-patches@gnu.org; Tue, 15 Sep 2020 21:05:51 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:37985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kILtN-0004CA-EG for guix-patches@gnu.org; Tue, 15 Sep 2020 21:05:51 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id AD2B9A73; Tue, 15 Sep 2020 21:05:47 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 15 Sep 2020 21:05:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=AehDDDIFRepQCudfsx9My7I OsSW0rYh1G2GxJ8+bzvU=; b=g1u3u1kqiWxFD1/cWhJCNvup21Mcz4+yJ1cDkoh b+16Z5xTwwOlfuvms00kvpJ3VWZQ/ghpEJohx/NZ48KpgSPlMMDW9Qk7pXv9fmSl FY8HTrU/KBLSztVKSv59F4iMtyBr/cKXx4rCtk/fj8E672Kt79FMbGDEd98km80J CdNQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=AehDDDIFRepQCudfs x9My7IOsSW0rYh1G2GxJ8+bzvU=; b=ZDvbOyMqejZ2S62Oyb5RmSFJdAGgSJlNe onLI5/6nSXMQ4ePYuMGd6XnuKEVKlWT4NM+rjJTmKjE7X/Fuz55QanK3o80BR25o WBnv7fW0qAfkG3XGz1ojV25Q/jTQxcQsqHGrnj1Ag9D+vFdVuzws72ZYUtQsT1OJ WZUd18SgExYUhZJhrDjbrnkGo9khIBR1XRE1+XDGwYf2paqTzyLG+A/Q6rbGwVEE iq7LLewqEx2PEuVv4dUUcn/nvdWQexOxF4z1Yd8+sgp57qGcZSB/umuxqggsW4sd 4Bm8KFfHakhxv8W/ZRBhUrObLGsvXkseQtRqspqyiWh7eF984K+4A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrtddugdefgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdr nhgrmhgvqeenucggtffrrghtthgvrhhnpeegkeevvdefteekleegjeejjeejhfeiffeuie eltedvgeeghefhkeekvefhuddugfenucffohhmrghinhepfhhsfhhlrgdrohhrghenucfk phepjeefrddugedurdduvdejrddugeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from jasmine.lan (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id EBF423064682 for ; Tue, 15 Sep 2020 21:05:46 -0400 (EDT) From: Leo Famulari Date: Tue, 15 Sep 2020 21:05:22 -0400 Message-Id: <77e65a3b34c2ab70b6f7516595dfa5cd6e6844a1.1600218322.git.leo@famulari.name> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.24; envelope-from=leo@famulari.name; helo=wout1-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 21:05:48 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This is a followup to commit 105a037090d9a970a2c2336341d6673eff29e4cf. * gnu/packages/linux.scm (linux-libre-deblob-scripts): Truncate the version in the file-name, not the source URI. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 59ffb334e0..2e47b81cf6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -195,9 +195,9 @@ defconfig. Return the appropriate make target if applicable, otherwise return (method url-fetch) (uri (string-append "https://linux-libre.fsfla.org" "/pub/linux-libre/releases/" version "-gnu/" - "deblob-" version)) + "deblob-" (version-major+minor version))) (file-name (string-append "linux-libre-deblob-" - (version-major+minor version))) + version)) (sha256 deblob-hash)) (origin (method url-fetch)