From patchwork Mon Mar 30 17:32:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 20996 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 C2F9527BBEA; Mon, 30 Mar 2020 18:35:46 +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 autolearn=ham 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 4E67327BBE4 for ; Mon, 30 Mar 2020 18:35:46 +0100 (BST) Received: from localhost ([::1]:53982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIyK9-0003oY-L9 for patchwork@mira.cbaines.net; Mon, 30 Mar 2020 13:35:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34359) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIyHX-0007tB-Py for guix-patches@gnu.org; Mon, 30 Mar 2020 13:33:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jIyHW-0007uh-EP for guix-patches@gnu.org; Mon, 30 Mar 2020 13:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51678) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jIyHW-0007uV-8O for guix-patches@gnu.org; Mon, 30 Mar 2020 13:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jIyHW-0004Uz-5G for guix-patches@gnu.org; Mon, 30 Mar 2020 13:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40190] Linux-Libre 5.5.x Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Mar 2020 17:33: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.158558956717269 (code B ref 40190); Mon, 30 Mar 2020 17:33:02 +0000 Received: (at 40190) by debbugs.gnu.org; 30 Mar 2020 17:32:47 +0000 Received: from localhost ([127.0.0.1]:34991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jIyHG-0004UT-Vg for submit@debbugs.gnu.org; Mon, 30 Mar 2020 13:32:47 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:36928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jIyHE-0004UC-Ss for 40190@debbugs.gnu.org; Mon, 30 Mar 2020 13:32:45 -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 B1CC01A9BD; Mon, 30 Mar 2020 10:32:38 -0700 (PDT) From: Vagrant Cascadian In-Reply-To: <87mu87btng.fsf@yucca> References: <87k13gqhrw.fsf@ponder> <87sgi0le3g.fsf@ponder> <87mu87btng.fsf@yucca> Date: Mon, 30 Mar 2020 10:32:18 -0700 Message-ID: <87mu7xg34t.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-22, Vagrant Cascadian wrote: > On 2020-03-22, Vagrant Cascadian wrote: >> On 2020-03-19, Vagrant Cascadian wrote: >>> So far, I haven't had time to test and update linux-libre 5.5 with the >>> kernel configs and so on, so I've been working on a >>> linux-libre-arm64-generic package that uses the defconfig (much like >>> linux-libre-arm-generic) and linux-libre 5.5.x. >> >> I was able to test linux-libre 5.5.10 on x86_64 by copying the 5.4 >> kernel config over to 5.5 and building, and it seemed to work fine. I was advised to regenerate the kernel configs using "make oldconfig", but there was nothing obvious *to me* to change, and I ended up hitting enter the whole way through... so leaving with these for now. >> I also did a build of linux-libre-arm-generic using 5.5.10, and it >> seemed to work fine as well. >> >> It also occurs to me that it would be nice to get a newer kernel into >> the upcoming release, unless there's a reason not to... > > Updated patch series, which also includes updating the default > linux-libre to 5.5. The pinebook pro portions have already been merged for 5.4.x, and still apply to 5.5.x. Attached is the first patch of an updated series for linux-libre 5.5.13, following up with a second patch to actually switch the default to 5.5.x. Boot tested on x86_64. I'm tempted to at least merge the first patch and create a linux-libre-arm64-generic-5.5 package until it switches to the default... live well, vagrant From 5f846e37c42ad827e5ef40f3eb7139dc054db5da Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 14 Mar 2020 18:54:50 -0700 Subject: [PATCH 1/2] 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 701df764cd..6b406f8dc5 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.13" + (base32 "1vj3rnrbkhj86lkabhrcm8qiqcz1lqi0lk54ysmg3lanf2vqgvab") + (base32 "1r87n60a1ksajqvkra55w4fa2iwsbhys3id8z2j179429pm0ybwn"))) + (define deblob-scripts-5.4 (linux-libre-deblob-scripts "5.4.28" @@ -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.13") +(define-public linux-libre-5.5-pristine-source + (let ((version linux-libre-5.5-version) + (hash (base32 "1qjf18qywzrfdzwpgpf6m0w0bil8rbc9hby8473ckzvbl0a3cfqz"))) + (make-linux-libre-source version + (%upstream-linux-source version hash) + deblob-scripts-5.5))) + (define-public linux-libre-5.4-version "5.4.28") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) @@ -430,6 +444,15 @@ 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 + ;; Pinebook Pro patch from linux-next, + ;; can be dropped for linux-libre 5.7 + (search-patch + "linux-libre-support-for-Pinebook-Pro.patch")))) + (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-pristine-source (list %boot-logo-patch @@ -529,6 +552,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)) @@ -793,6 +820,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