From patchwork Wed Mar 25 03:43:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 20882 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 34F3027BBEA; Wed, 25 Mar 2020 03:44:17 +0000 (GMT) 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=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 F20A727BBE4 for ; Wed, 25 Mar 2020 03:44:16 +0000 (GMT) Received: from localhost ([::1]:58818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGwxk-00087q-Dh for patchwork@mira.cbaines.net; Tue, 24 Mar 2020 23:44:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49576) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGwxW-00087k-P5 for guix-patches@gnu.org; Tue, 24 Mar 2020 23:44:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGwxV-0004rS-Q9 for guix-patches@gnu.org; Tue, 24 Mar 2020 23:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49861) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGwxV-0004rN-Nt for guix-patches@gnu.org; Tue, 24 Mar 2020 23:44:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jGwxV-0000zt-Lz for guix-patches@gnu.org; Tue, 24 Mar 2020 23:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40218] linux-libre patch to support pinebook pro Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Mar 2020 03:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40218 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40218@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15851078023768 (code B ref -1); Wed, 25 Mar 2020 03:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Mar 2020 03:43:22 +0000 Received: from localhost ([127.0.0.1]:55834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jGwwr-0000yi-Oc for submit@debbugs.gnu.org; Tue, 24 Mar 2020 23:43:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:35341) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jGwwq-0000yV-58 for submit@debbugs.gnu.org; Tue, 24 Mar 2020 23:43:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49525) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGwwp-00087N-0r for guix-patches@gnu.org; Tue, 24 Mar 2020 23:43:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGwwn-0004he-US for guix-patches@gnu.org; Tue, 24 Mar 2020 23:43:18 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:35096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jGwwn-0004hN-Ok for guix-patches@gnu.org; Tue, 24 Mar 2020 23:43:17 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100b]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 4F7A11A9BD for ; Tue, 24 Mar 2020 20:43:16 -0700 (PDT) From: Vagrant Cascadian In-Reply-To: <87a74516fx.fsf@yucca> References: <87a74516fx.fsf@yucca> Date: Tue, 24 Mar 2020 20:43:13 -0700 Message-ID: <877dz914mm.fsf@yucca> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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-24, Vagrant Cascadian wrote: > The one reason I haven't pushed the patch is it would cause useless > rebuilds of linux-libre for x86_64, i686 and armhf; I've been trying to > make that conditional for aarch64 and not been very successful at it; if > someone could help with that, or give me the go-ahead to merge as is > ... that'd be great! FWIW, this is one of the permutations I've tried so far: (define-public linux-libre-4.19-source (source-with-patches linux-libre-4.19-pristine-source But with this, I get the source without the patch applied in all cases... live well, vagrant --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -432,12 +432,16 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-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-Add-initial-support-for-Pinebook-.patch")))) + (cons* %boot-logo-patch + %linux-libre-arm-export-__sync_icache_dcache-patch + (if (let ((system (or (%current-target-system) + (%current-system)))) + (string-prefix? "aarch64" system)) + ;; Pinebook Pro patch from linux-next, + ;; can be dropped for linux-libre 5.7 + '((search-patch + "linux-libre-Add-initial-support-for-Pinebook-.patch")) + '()))))