From patchwork Fri May 24 21:57:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 14068 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 C283117042; Fri, 24 May 2019 22:58:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4EFE317040 for ; Fri, 24 May 2019 22:58:07 +0100 (BST) Received: from localhost ([127.0.0.1]:60608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hUICT-0001ri-VN for patchwork@mira.cbaines.net; Fri, 24 May 2019 17:58:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hUICR-0001rP-B7 for guix-patches@gnu.org; Fri, 24 May 2019 17:58:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hUICQ-0002ik-5U for guix-patches@gnu.org; Fri, 24 May 2019 17:58:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33958) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hUICP-0002iW-Tx for guix-patches@gnu.org; Fri, 24 May 2019 17:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hUICP-0005q8-Ro for guix-patches@gnu.org; Fri, 24 May 2019 17:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35888] [PATCH] gnu: Use make-linux-libre-headers. Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 May 2019 21:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35888@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155873507522434 (code B ref -1); Fri, 24 May 2019 21:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 May 2019 21:57:55 +0000 Received: from localhost ([127.0.0.1]:47502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hUICI-0005pl-Sz for submit@debbugs.gnu.org; Fri, 24 May 2019 17:57:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hUICG-0005pW-Jh for submit@debbugs.gnu.org; Fri, 24 May 2019 17:57:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:38756) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hUICB-0002ZK-Dp for submit@debbugs.gnu.org; Fri, 24 May 2019 17:57:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hUICA-0001r0-5s for guix-patches@gnu.org; Fri, 24 May 2019 17:57:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hUIC8-0002Xn-VL for guix-patches@gnu.org; Fri, 24 May 2019 17:57:46 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:46069) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hUIC8-0002WC-Cd for guix-patches@gnu.org; Fri, 24 May 2019 17:57:44 -0400 Date: Fri, 24 May 2019 21:57:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1558735057; bh=VxYqGVtpSNfm0j6fF9NNm6gxz11pOqGXYGCEgwH7sEs=; h=Date:To:From:Cc:Reply-To:Subject:Feedback-ID:From; b=Y9mPATzd+n3OdepZ4cBLcL9m7bvofumX9w5VYKvNN8CKldg4h5rZ5fXtnZL6NOXAs hk1no0Fug7fshkyCd6RVln1xQKCujSKTyYBe4Ukm9A8dO9tGTwAixFEdgTpoBwKAFM Vo4JCGw7YNjxxV4ERN9TYbEMUS82EgDjJuiH6DN0= From: Carl Dong Message-ID: Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Cc: Carl Dong Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (make-linux-libre-headers): New variable. (linux-libre): Rename and define as linux-libre-5.1. (linux-libre-headers): Rename and define as linux-libre-headers-4.14.67. (linux-libre-5.1, linux-libre-headers-4.14.67): Use make-linux-libre-headers. (linux-libre-5.1, linux-libre-headers-5.1, linux-libre-headers-4.19, %linux-libre-4.15-version, %linux-libre-4.15-hash, linux-libre-4.15, linux-libre-headers-4.15, linux-libre-headers-4.14): New variables. --- gnu/packages/linux.scm | 48 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b645249649..18e091a95a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -169,18 +169,20 @@ defconfig. Return the appropriate make target if applicable, otherwise return "mirror://gnu/linux-libre/" version "-gnu/linux-libre-" version "-gnu.tar.xz"))) -(define-public linux-libre-headers +(define (make-linux-libre-headers version hash) (package (name "linux-libre-headers") - (version "4.14.67") + (version version) (source (origin (method url-fetch) (uri (linux-libre-urls version)) - (sha256 - (base32 - "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg")))) + (sha256 (base32 hash)))) (build-system gnu-build-system) - (native-inputs `(("perl" ,perl))) + (native-inputs `(("perl" ,perl) + ,@(if (version>=? version "4.16") + `(("flex" ,flex) + ("bison" ,bison)) + '()))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) @@ -433,13 +435,17 @@ It has been modified to remove all non-free binary blobs.") (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch)) -(define-public linux-libre +(define-public linux-libre-5.1 (make-linux-libre %linux-libre-version %linux-libre-hash '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") #:patches %linux-libre-5.1-patches #:configuration-file kernel-config)) +(define-public linux-libre-headers-5.1 + (make-linux-libre-headers %linux-libre-version + %linux-libre-hash)) + (define %linux-libre-4.19-version "4.19.45") (define %linux-libre-4.19-hash "1wiy8vzpzzml4k76nv3ycjx7ky55x7dqx3mgpjqbh73mj2gcr5bx") @@ -454,6 +460,23 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) +(define-public linux-libre-headers-4.19 + (make-linux-libre-headers %linux-libre-4.19-version + %linux-libre-4.19-hash)) + +(define %linux-libre-4.15-version "4.15.18") +(define %linux-libre-4.15-hash "0f0s4drx888ydlwjcm9qcxqian4850yiv2vamyw9bbjf83frwxyw") + +(define-public linux-libre-4.15 + (make-linux-libre %linux-libre-4.15-version + %linux-libre-4.15-hash + '("x86_64-linux" "i686-linux" "armhf-linux") + #:configuration-file kernel-config)) + +(define-public linux-libre-headers-4.15 + (make-linux-libre-headers %linux-libre-4.15-version + %linux-libre-4.15-hash)) + (define %linux-libre-4.14-version "4.14.121") (define %linux-libre-4.14-hash "1g7gyjmp056pasf9m34dqs8pa15my6hqasdd551jw8mgkbhsfnxg") @@ -463,6 +486,10 @@ It has been modified to remove all non-free binary blobs.") '("x86_64-linux" "i686-linux" "armhf-linux") #:configuration-file kernel-config)) +(define-public linux-libre-headers-4.14 + (make-linux-libre-headers %linux-libre-4.14-version + %linux-libre-4.14-hash)) + (define-public linux-libre-4.9 (make-linux-libre "4.9.178" "1ridlkymf382qnkc6hi07pkghrrxfv2avx55snjnkfcpdccvsmrb" @@ -481,6 +508,13 @@ It has been modified to remove all non-free binary blobs.") ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)) %default-extra-linux-options))) +(define-public linux-libre-headers-4.14.67 + (make-linux-libre-headers "4.14.67" + "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg")) + +(define-public linux-libre-headers linux-libre-headers-4.14.67) +(define-public linux-libre linux-libre-5.1) + (define-public linux-libre-arm-generic (make-linux-libre %linux-libre-version %linux-libre-hash