From ff148ea5d6f2b7799b4bee54b9d8123fe6007abc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 31 Dec 2018 22:45:13 -0500 Subject: gnu: linux-libre: Update to 4.20, while retaining 4.19 LTS. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.20. (%linux-libre-hash): Update hash. (%linux-libre-4.20-patches): New variable. (linux-libre): Use %linux-libre-4.20-patches. (%linux-libre-4.19-version, %linux-libre-4.19-hash) (%linux-libre-4.19-patches, linux-libre-4.19): New variables. (linux-libre-arm-generic, linux-libre-arm-omap2plus): Use %linux-libre-4.20-patches. (linux-libre-arm-generic-4.19, linux-libre-arm-omap2plus-4.19): New variables. * gnu/packages/aux-files/linux-libre/4.20-arm.conf, gnu/packages/aux-files/linux-libre/4.20-arm64.conf, gnu/packages/aux-files/linux-libre/4.20-i686.conf, gnu/packages/aux-files/linux-libre/4.20-x86_64.conf: New files. * Makefile.am (AUX_FILES): Add them. --- gnu/packages/linux.scm | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 982fbe56aa..4fb85f2f3c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -412,10 +412,10 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "4.19.13") -(define %linux-libre-hash "0ac0ywy542fiwdiab2z12rbjn9zw8vjbzkbpmpk9nfic2mcyrg8r") +(define %linux-libre-version "4.20") +(define %linux-libre-hash "07ss8nx95f4pqzzjy382fy5hk7anjm3hpbb3mzl1x8fzfq05q3dq") -(define %linux-libre-4.19-patches +(define %linux-libre-4.20-patches (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch)) @@ -423,6 +423,20 @@ It has been modified to remove all non-free binary blobs.") (make-linux-libre %linux-libre-version %linux-libre-hash '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") + #:patches %linux-libre-4.20-patches + #:configuration-file kernel-config)) + +(define %linux-libre-4.19-version "4.19.13") +(define %linux-libre-4.19-hash "0ac0ywy542fiwdiab2z12rbjn9zw8vjbzkbpmpk9nfic2mcyrg8r") + +(define %linux-libre-4.19-patches + (list %boot-logo-patch + %linux-libre-arm-export-__sync_icache_dcache-patch)) + +(define-public linux-libre-4.19 + (make-linux-libre %linux-libre-4.19-version + %linux-libre-4.19-hash + '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) @@ -451,6 +465,14 @@ It has been modified to remove all non-free binary blobs.") (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") + #:patches %linux-libre-4.20-patches + #:defconfig "multi_v7_defconfig" + #:extra-version "arm-generic")) + +(define-public linux-libre-arm-generic-4.19 + (make-linux-libre %linux-libre-4.19-version + %linux-libre-4.19-hash + '("armhf-linux") #:patches %linux-libre-4.19-patches #:defconfig "multi_v7_defconfig" #:extra-version "arm-generic")) @@ -466,6 +488,14 @@ It has been modified to remove all non-free binary blobs.") (make-linux-libre %linux-libre-version %linux-libre-hash '("armhf-linux") + #:patches %linux-libre-4.20-patches + #:defconfig "omap2plus_defconfig" + #:extra-version "arm-omap2plus")) + +(define-public linux-libre-arm-omap2plus-4.19 + (make-linux-libre %linux-libre-4.19-version + %linux-libre-4.19-hash + '("armhf-linux") #:patches %linux-libre-4.19-patches #:defconfig "omap2plus_defconfig" #:extra-version "arm-omap2plus")) -- cgit v1.3