From patchwork Tue Mar 31 00:10:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 21004 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1E09327BBE4; Tue, 31 Mar 2020 01:13:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AA94F27BBE1 for ; Tue, 31 Mar 2020 01:12:59 +0100 (BST) Received: from localhost ([::1]:58518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJ4WZ-0003Kt-2C for patchwork@mira.cbaines.net; Mon, 30 Mar 2020 20:12:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36588) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJ4Ui-0000vl-A2 for guix-patches@gnu.org; Mon, 30 Mar 2020 20:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJ4Ug-00055e-NE for guix-patches@gnu.org; Mon, 30 Mar 2020 20:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51963) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJ4Ug-000557-Ho for guix-patches@gnu.org; Mon, 30 Mar 2020 20:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jJ4Ug-0004wV-9m for guix-patches@gnu.org; Mon, 30 Mar 2020 20:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40190] Linux-Libre 5.6 Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Mar 2020 00:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40190 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40190@debbugs.gnu.org Cc: Mark H Weaver Received: via spool by 40190-submit@debbugs.gnu.org id=B40190.158561346118992 (code B ref 40190); Tue, 31 Mar 2020 00:11:02 +0000 Received: (at 40190) by debbugs.gnu.org; 31 Mar 2020 00:11:01 +0000 Received: from localhost ([127.0.0.1]:35276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jJ4Ue-0004wF-Ac for submit@debbugs.gnu.org; Mon, 30 Mar 2020 20:11:01 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:37562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jJ4Ub-0004w2-OE for 40190@debbugs.gnu.org; Mon, 30 Mar 2020 20:10:58 -0400 Received: from localhost (71-34-65-38.ptld.qwest.net [71.34.65.38]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 09D801A9BD; Mon, 30 Mar 2020 17:10:51 -0700 (PDT) From: Vagrant Cascadian In-Reply-To: <87h7y5g30m.fsf@ponder> References: <87k13gqhrw.fsf@ponder> <87sgi0le3g.fsf@ponder> <87mu87btng.fsf@yucca> <87mu7xg34t.fsf@ponder> <87h7y5g30m.fsf@ponder> Date: Mon, 30 Mar 2020 17:10:45 -0700 Message-ID: <874ku5fkoq.fsf@ponder> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On 2020-03-30, Vagrant Cascadian wrote: > And the second patch, switching to 5.5... And a third, rougher, less well tested patch switching to 5.6... which could obviously be squashed into the previous patches and maybe skip 5.5 altogether. live well, vagrant 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