From patchwork Wed Sep 2 18:30:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 23874 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 038CA27BBE8; Wed, 2 Sep 2020 19:32:18 +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 BDD5A27BBE7 for ; Wed, 2 Sep 2020 19:32:17 +0100 (BST) Received: from localhost ([::1]:58238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDXYO-0000Os-TJ for patchwork@mira.cbaines.net; Wed, 02 Sep 2020 14:32:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDXYC-0000NB-6F for guix-patches@gnu.org; Wed, 02 Sep 2020 14:32:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49156) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDXYA-0003Sh-OZ for guix-patches@gnu.org; Wed, 02 Sep 2020 14:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDXYA-0006B5-K3 for guix-patches@gnu.org; Wed, 02 Sep 2020 14:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43173] [PATCH 1/2] gnu: Do not truncate the version of the linux-libre deblobbing script file names. References: <20200902182922.GA26301@jasmine.lan> In-Reply-To: <20200902182922.GA26301@jasmine.lan> Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Sep 2020 18:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 43173@debbugs.gnu.org Received: via spool by 43173-submit@debbugs.gnu.org id=B43173.159907146223653 (code B ref 43173); Wed, 02 Sep 2020 18:32:02 +0000 Received: (at 43173) by debbugs.gnu.org; 2 Sep 2020 18:31:02 +0000 Received: from localhost ([127.0.0.1]:60700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDXXB-00069M-Pk for submit@debbugs.gnu.org; Wed, 02 Sep 2020 14:31:02 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:59481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDXXA-000694-4C for 43173@debbugs.gnu.org; Wed, 02 Sep 2020 14:31:00 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 501D1F93; Wed, 2 Sep 2020 14:30:54 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 02 Sep 2020 14:30:54 -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=g2yUSORCOLnabzbPB72O0M7 2XWsed5T/pCYDG6RRq/A=; b=XOJvAA6bi1fsokChinunPzvjhBCj6s06VCBiAjr pmAnlmjH6F8/Z9Wc3s74KZ5lyptKbXor59LEFYlLAgrT1/Ee0d/bumnJ1ajCuJle v3ewpNuRJI/xldKJtr7RnolfroUGoAFay+DyW4U6V+qP0cwmdEBbYHlZtrfXbN6Q DePw= 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=g2yUSORCOLnabzbPB 72O0M72XWsed5T/pCYDG6RRq/A=; b=dYcroVJA7mrkoSDhEDZnsgvXtEgIqsveS Oe+kkDpYts1kg1UfbfFdbC9AVSzaCFyluUNuAKT24z6bde2Kf77dnfh0FSkua03d G3I4pXeyM9njsNW/pk0GmhUEyIY0cMYYEgojKGPEVg97kBt8xNgl5TgQ4Cz0RfhO K9d+BExNnbNeXE4LoNXSn+pA/U2GY5HBOuONS6a4N3m1him3ofIdX2cqUMca7Csi a697uRr96t+gaRvtPVMVXTnNyB9FTozsPoCIR94b70HczFjgYVNKBnlcLYYpuU9v +FSULpJVg9MsPoTfScaY+5K/cLUDMf48oG5PCyUqDvnUluaRquAgA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudefledguddviecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeegkeevvdefteekleegjeejjeejhfeiff euieeltedvgeeghefhkeekvefhuddugfenucffohhmrghinhepfhhsfhhlrgdrohhrghen ucfkphepjeefrddugedurdduvdejrddugeeinecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg 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 888AF306005E for <43173@debbugs.gnu.org>; Wed, 2 Sep 2020 14:30:53 -0400 (EDT) From: Leo Famulari Date: Wed, 2 Sep 2020 14:30:36 -0400 Message-Id: <4d36157b10b143ce60e145e49dbf59df2dcd415c.1599071437.git.leo@famulari.name> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 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 * gnu/packages/linux.scm (linux-libre-deblob-scripts): Use VERSION instead of VERSION-MAJOR+MINOR. --- gnu/packages/linux.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b742688f79..8b66ed2b60 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -193,7 +193,7 @@ 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-major+minor version))) + "deblob-" version)) (file-name (string-append "linux-libre-deblob-" (version-major+minor version))) (sha256 deblob-hash)) @@ -202,8 +202,7 @@ defconfig. Return the appropriate make target if applicable, otherwise return (uri (string-append "https://linux-libre.fsfla.org" "/pub/linux-libre/releases/" version "-gnu/" "deblob-check")) - (file-name (string-append "linux-libre-deblob-check-" - (version-major+minor version))) + (file-name (string-append "linux-libre-deblob-check-" version)) (sha256 deblob-check-hash)))) (define deblob-scripts-5.8