diff options
author | Carl Dong <accounts@carldong.me> | 2019-05-29 18:04:43 +0200 |
---|---|---|
committer | Danny Milosavljevic <dannym@scratchpost.org> | 2019-05-29 18:19:16 +0200 |
commit | a15cee50cebddc665a16b455f44e22dcfb87d57f (patch) | |
tree | d68ec0eefb01ec7e07b95b195018b0390bbc4f1e | |
parent | 2ea77d48a739eb289f2472d2c30c37a30bbcb571 (diff) | |
download | guix-a15cee50cebddc665a16b455f44e22dcfb87d57f.tar.gz guix-a15cee50cebddc665a16b455f44e22dcfb87d57f.zip |
gnu: Use make-linux-libre-headers.
* gnu/packages/linux.scm (make-linux-libre-headers): New variable.
(linux-libre): Rename to...
(linux-libre-5.1): ...this.
(linux-libre-headers): Rename to...
(linux-libre-headers-4.14.67): ...this.
(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.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
-rw-r--r-- | gnu/packages/linux.scm | 49 |
1 files changed, 42 insertions, 7 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bc519409c0..ac26b024aa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -171,18 +171,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) @@ -435,13 +437,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.46") (define %linux-libre-4.19-hash "17yy3h064kr7zck07wdrw3fmmmnfk15m17xvkpkc4yv5vxxi76vh") @@ -456,6 +462,24 @@ 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.122") (define %linux-libre-4.14-hash "0923m61b3gwm69w6m9zhb8az57lrwn7igdysf8wb7ld9z4hzpag8") @@ -465,6 +489,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.179" "0nc9a7b7g5a18fdc8dswm3la7srn5sgz8adavp8r9h3ya9zh3wim" @@ -491,6 +519,13 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config-veyron #:extra-version "arm-veyron")) +(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 |