From 029c3aa58db3e4ec7b54502c297d573361726fbc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 30 Mar 2020 21:09:28 +0000 Subject: [PATCH] gnu: linux-libre: Update to 5.6. --- Makefile.am | 8 ++-- .../{5.5-arm.conf => 5.6-arm.conf} | 0 .../{5.5-arm64.conf => 5.6-arm64.conf} | 0 .../{5.5-i686.conf => 5.6-i686.conf} | 0 .../{5.5-x86_64.conf => 5.6-x86_64.conf} | 0 gnu/packages/linux.scm | 42 +++++++++---------- 6 files changed, 25 insertions(+), 25 deletions(-) rename gnu/packages/aux-files/linux-libre/{5.5-arm.conf => 5.6-arm.conf} (100%) rename gnu/packages/aux-files/linux-libre/{5.5-arm64.conf => 5.6-arm64.conf} (100%) rename gnu/packages/aux-files/linux-libre/{5.5-i686.conf => 5.6-i686.conf} (100%) rename gnu/packages/aux-files/linux-libre/{5.5-x86_64.conf => 5.6-x86_64.conf} (100%) diff --git a/Makefile.am b/Makefile.am index 5b1fff3110..b8515c813a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -321,10 +321,10 @@ dist_noinst_DATA = \ AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ - gnu/packages/aux-files/linux-libre/5.5-arm.conf \ - gnu/packages/aux-files/linux-libre/5.5-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.5-i686.conf \ - gnu/packages/aux-files/linux-libre/5.5-x86_64.conf \ + gnu/packages/aux-files/linux-libre/5.6-arm.conf \ + gnu/packages/aux-files/linux-libre/5.6-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.6-i686.conf \ + gnu/packages/aux-files/linux-libre/5.6-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.4-arm.conf \ gnu/packages/aux-files/linux-libre/5.4-arm64.conf \ gnu/packages/aux-files/linux-libre/5.4-i686.conf \ diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm.conf b/gnu/packages/aux-files/linux-libre/5.6-arm.conf similarity index 100% rename from gnu/packages/aux-files/linux-libre/5.5-arm.conf rename to gnu/packages/aux-files/linux-libre/5.6-arm.conf diff --git a/gnu/packages/aux-files/linux-libre/5.5-arm64.conf b/gnu/packages/aux-files/linux-libre/5.6-arm64.conf similarity index 100% rename from gnu/packages/aux-files/linux-libre/5.5-arm64.conf rename to gnu/packages/aux-files/linux-libre/5.6-arm64.conf diff --git a/gnu/packages/aux-files/linux-libre/5.5-i686.conf b/gnu/packages/aux-files/linux-libre/5.6-i686.conf similarity index 100% rename from gnu/packages/aux-files/linux-libre/5.5-i686.conf rename to gnu/packages/aux-files/linux-libre/5.6-i686.conf diff --git a/gnu/packages/aux-files/linux-libre/5.5-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.6-x86_64.conf similarity index 100% rename from gnu/packages/aux-files/linux-libre/5.5-x86_64.conf rename to gnu/packages/aux-files/linux-libre/5.6-x86_64.conf diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8adbfe7b0b..4669957aa6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -192,11 +192,11 @@ defconfig. Return the appropriate make target if applicable, otherwise return "deblob-check")) (sha256 deblob-check-hash)))) -(define deblob-scripts-5.5 +(define deblob-scripts-5.6 (linux-libre-deblob-scripts - "5.5.13" - (base32 "1vj3rnrbkhj86lkabhrcm8qiqcz1lqi0lk54ysmg3lanf2vqgvab") - (base32 "1r87n60a1ksajqvkra55w4fa2iwsbhys3id8z2j179429pm0ybwn"))) + "5.6" + (base32 "09hxrr4xzllq5lmipfb6if30318lksrk9py1axc36m9ynql4w0rc") + (base32 "09qz5d31g5zwicsnncjnjij193hk0g6kg0ss9jyzh6lp3wilcm71"))) (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -368,13 +368,13 @@ 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.13") -(define-public linux-libre-5.5-pristine-source - (let ((version linux-libre-5.5-version) - (hash (base32 "1qjf18qywzrfdzwpgpf6m0w0bil8rbc9hby8473ckzvbl0a3cfqz"))) +(define-public linux-libre-5.6-version "5.6") +(define-public linux-libre-5.6-pristine-source + (let ((version linux-libre-5.6-version) + (hash (base32 "08mnzic407d3wjg3vyccxwqx02sjzhlapfpi1vm0hf56595b0hp3"))) (make-linux-libre-source version (%upstream-linux-source version hash) - deblob-scripts-5.5))) + deblob-scripts-5.6))) (define-public linux-libre-5.4-version "5.4.28") (define-public linux-libre-5.4-pristine-source @@ -444,8 +444,8 @@ 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 +(define-public linux-libre-5.6-source + (source-with-patches linux-libre-5.6-pristine-source (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch ;; Pinebook Pro patch from linux-next, @@ -552,9 +552,9 @@ 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.6 + (make-linux-libre-headers* linux-libre-5.6-version + linux-libre-5.6-source)) (define-public linux-libre-headers-5.4 (make-linux-libre-headers* linux-libre-5.4-version @@ -820,16 +820,16 @@ 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 +(define-public linux-libre-5.6 + (make-linux-libre* linux-libre-5.6-version + linux-libre-5.6-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") #:configuration-file kernel-config)) -(define-public linux-libre-version linux-libre-5.5-version) -(define-public linux-libre-pristine-source linux-libre-5.5-pristine-source) -(define-public linux-libre-source linux-libre-5.5-source) -(define-public linux-libre linux-libre-5.5) +(define-public linux-libre-version linux-libre-5.6-version) +(define-public linux-libre-pristine-source linux-libre-5.6-pristine-source) +(define-public linux-libre-source linux-libre-5.6-source) +(define-public linux-libre linux-libre-5.6) (define-public linux-libre-5.4 (make-linux-libre* linux-libre-5.4-version -- 2.20.1