From ffef750306d4f2ee3a228938620647270fabc85a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 14 Mar 2020 18:54:50 -0700 Subject: [PATCH 1/3] gnu: Add linux-libre 5.5. * gnu/packages/linux (deblob-scripts-5.5): New variable. (linux-libre-5.5-version): New variable. (linux-libre-5.5-pristine-source): New variable. (linux-libre-5.5-source): New variable. (linux-libre-headers-5.5): New variable. (linux-libre-5.5): New variable. --- gnu/packages/linux.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8dd5061b6c..0b93f0156d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -192,6 +192,12 @@ defconfig. Return the appropriate make target if applicable, otherwise return "deblob-check")) (sha256 deblob-check-hash)))) +(define deblob-scripts-5.5 + (linux-libre-deblob-scripts + "5.5.9" + (base32 "1vj3rnrbkhj86lkabhrcm8qiqcz1lqi0lk54ysmg3lanf2vqgvab") + (base32 "1j44hx6kis6gz9r6yb0s3f17ham24qv0nih6sxsnd2gwxdsid535"))) + (define deblob-scripts-5.4 (linux-libre-deblob-scripts "5.4.19" @@ -362,6 +368,14 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) +(define-public linux-libre-5.5-version "5.5.9") +(define-public linux-libre-5.5-pristine-source + (let ((version linux-libre-5.5-version) + (hash (base32 "0y58gkzadjwfqfry5568g4w4p2mpx2sw50sk95i07s5va1ly2dd4"))) + (make-linux-libre-source version + (%upstream-linux-source version hash) + deblob-scripts-5.5))) + (define-public linux-libre-5.4-version "5.4.25") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) @@ -430,6 +444,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (patches (append (origin-patches source) patches)))) +(define-public linux-libre-5.5-source + (source-with-patches linux-libre-5.5-pristine-source + (list %boot-logo-patch + %linux-libre-arm-export-__sync_icache_dcache-patch))) + (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-pristine-source (list %boot-logo-patch @@ -525,6 +544,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.5 + (make-linux-libre-headers* linux-libre-5.5-version + linux-libre-5.5-source)) + (define-public linux-libre-headers-5.4 (make-linux-libre-headers* linux-libre-5.4-version linux-libre-5.4-source)) @@ -782,6 +805,12 @@ It has been modified to remove all non-free binary blobs.") ;;; Generic kernel packages. ;;; +(define-public linux-libre-5.5 + (make-linux-libre* linux-libre-5.5-version + linux-libre-5.5-source + '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") + #:configuration-file kernel-config)) + (define-public linux-libre-5.4 (make-linux-libre* linux-libre-5.4-version linux-libre-5.4-source -- 2.20.1