diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
commit | e08902d3cbb307e1523485becbbdaf9aed56ac4a (patch) | |
tree | ca79454c4146f37c0e0f4d354d434816928812ed /gnu/packages/linux.scm | |
parent | 1714edc3d4e8d6da1b0cdef300ae882d0885f182 (diff) | |
parent | f58702465d0b2daab1775d29439b73b4486a108a (diff) | |
download | guix-patches-e08902d3cbb307e1523485becbbdaf9aed56ac4a.tar guix-patches-e08902d3cbb307e1523485becbbdaf9aed56ac4a.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r-- | gnu/packages/linux.scm | 51 |
1 files changed, 42 insertions, 9 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 78de223947..e1fc4a983a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -115,6 +115,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages groff) + #:use-module (gnu packages rsync) #:use-module (gnu packages selinux) #:use-module (gnu packages swig) #:use-module (guix build-system cmake) @@ -180,6 +181,12 @@ defconfig. Return the appropriate make target if applicable, otherwise return "deblob-check")) (sha256 deblob-check-hash)))) +(define deblob-scripts-5.3 + (linux-libre-deblob-scripts + "5.3.1" + (base32 "15n09zq38d69y1wl28s3nasf3377qp2yil5b887zpqrm00dif7i4") + (base32 "1av9ykv714cnl0clls8rhwa8rwflz6ivg17gharj1x650qp6vnw3"))) + (define deblob-scripts-5.2 (linux-libre-deblob-scripts "5.2.17" @@ -350,18 +357,26 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.2-version "5.2.17") +(define-public linux-libre-5.3-version "5.3.2") +(define-public linux-libre-5.3-pristine-source + (let ((version linux-libre-5.3-version) + (hash (base32 "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn"))) + (make-linux-libre-source version + (%upstream-linux-source version hash) + deblob-scripts-5.3))) + +(define-public linux-libre-5.2-version "5.2.18") (define-public linux-libre-5.2-pristine-source (let ((version linux-libre-5.2-version) - (hash (base32 "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv"))) + (hash (base32 "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.2))) -(define-public linux-libre-4.19-version "4.19.75") +(define-public linux-libre-4.19-version "4.19.76") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx"))) + (hash (base32 "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) @@ -418,6 +433,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (patches (append (origin-patches source) patches)))) +(define-public linux-libre-5.3-source + (source-with-patches linux-libre-5.3-pristine-source + (list %boot-logo-patch + %linux-libre-arm-export-__sync_icache_dcache-patch))) + (define-public linux-libre-5.2-source (source-with-patches linux-libre-5.2-pristine-source (list (search-patch "linux-libre-active-entropy.patch") @@ -463,6 +483,9 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ,@(if (version>=? version "4.16") `(("flex" ,flex) ("bison" ,bison)) + '()) + ,@(if (version>=? version "5.3") + `(("rsync" ,rsync)) '()))) (arguments `(#:modules ((guix build gnu-build-system) @@ -511,6 +534,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (description "Headers of the Linux-Libre kernel.") (license license:gpl2))) +(define-public linux-libre-headers-5.3 + (make-linux-libre-headers* linux-libre-5.3-version + linux-libre-5.3-source)) + (define-public linux-libre-headers-5.2 (make-linux-libre-headers* linux-libre-5.2-version linux-libre-5.2-source)) @@ -765,17 +792,23 @@ It has been modified to remove all non-free binary blobs.") ;;; Generic kernel packages. ;;; +(define-public linux-libre-5.3 + (make-linux-libre* linux-libre-5.3-version + linux-libre-5.3-source + '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") + #:configuration-file kernel-config)) + +(define-public linux-libre-version linux-libre-5.3-version) +(define-public linux-libre-pristine-source linux-libre-5.3-pristine-source) +(define-public linux-libre-source linux-libre-5.3-source) +(define-public linux-libre linux-libre-5.3) + (define-public linux-libre-5.2 (make-linux-libre* linux-libre-5.2-version linux-libre-5.2-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") #:configuration-file kernel-config)) -(define-public linux-libre-version linux-libre-5.2-version) -(define-public linux-libre-pristine-source linux-libre-5.2-pristine-source) -(define-public linux-libre-source linux-libre-5.2-source) -(define-public linux-libre linux-libre-5.2) - (define-public linux-libre-4.19 (make-linux-libre* linux-libre-4.19-version linux-libre-4.19-source |