From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#35888] [PATCH] gnu: Use make-linux-libre-headers. Resent-Message-ID: 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 From: Carl Dong Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35888@debbugs.gnu.org Cc: Carl Dong * 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 app= licable, otherwise return "mirror://gnu/linux-libre/" version "-gnu/linux-libre-" version "-gnu.tar.xz"))) =20 -(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>=3D? 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 bl= obs.") (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch)) =20 -(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-l= inux") #:patches %linux-libre-5.1-patches #:configuration-file kernel-config)) =20 +(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 "1wiy8vzpzzml4k76nv3ycjx7ky55x7dqx3mgpjqbh7= 3mj2gcr5bx") =20 @@ -454,6 +460,23 @@ It has been modified to remove all non-free binary blo= bs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) =20 +(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 "0f0s4drx888ydlwjcm9qcxqian4850yiv2vamyw9bb= jf83frwxyw") + +(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 "1g7gyjmp056pasf9m34dqs8pa15my6hqasdd551jw8= mgkbhsfnxg") =20 @@ -463,6 +486,10 @@ It has been modified to remove all non-free binary blo= bs.") '("x86_64-linux" "i686-linux" "armhf-linux") #:configuration-file kernel-config)) =20 +(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 blo= bs.") ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)) %default-extra-linux-options))) =20 +(define-public linux-libre-headers-4.14.67 + (make-linux-libre-headers "4.14.67" + "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39b= vahnrpg")) + +(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 --=20 2.21.0