From patchwork Sat Feb 15 18:52:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 20258 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 2395F27BBE4; Sat, 15 Feb 2020 18:53:10 +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, 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 D33FC174E9 for ; Sat, 15 Feb 2020 18:53:09 +0000 (GMT) Received: from localhost ([::1]:53628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j32Yv-0002d9-D1 for patchwork@mira.cbaines.net; Sat, 15 Feb 2020 13:53:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33577) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j32Yp-0002aY-QI for guix-patches@gnu.org; Sat, 15 Feb 2020 13:53:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j32Yo-00068q-KP for guix-patches@gnu.org; Sat, 15 Feb 2020 13:53:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58642) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j32Yo-00068k-Hk for guix-patches@gnu.org; Sat, 15 Feb 2020 13:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j32Yo-00025Y-HJ for guix-patches@gnu.org; Sat, 15 Feb 2020 13:53:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39617] [PATCH 1/2] gnu: Add linux-libre-pinebook-pro. References: <87tv3rd6sz.fsf@gnu.org> In-Reply-To: <87tv3rd6sz.fsf@gnu.org> Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Feb 2020 18:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39617 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39617@debbugs.gnu.org Received: via spool by 39617-submit@debbugs.gnu.org id=B39617.15817927437977 (code B ref 39617); Sat, 15 Feb 2020 18:53:02 +0000 Received: (at 39617) by debbugs.gnu.org; 15 Feb 2020 18:52:23 +0000 Received: from localhost ([127.0.0.1]:36380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j32Y6-00024T-1p for submit@debbugs.gnu.org; Sat, 15 Feb 2020 13:52:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j32Y4-00024A-FY for 39617@debbugs.gnu.org; Sat, 15 Feb 2020 13:52:16 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:53875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j32Xz-0005L0-9d; Sat, 15 Feb 2020 13:52:11 -0500 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=39380 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1j32Xy-00039n-PW; Sat, 15 Feb 2020 13:52:11 -0500 From: Jan Nieuwenhuizen Date: Sat, 15 Feb 2020 19:52:08 +0100 Message-Id: <20200215185209.28334-1-janneke@gnu.org> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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 * gnu/packages/linux.scm (deblob-scripts-pinebook-pro): New function. (linux-libre-pinebook-pro): Use it to declare new variable. --- gnu/packages/linux.scm | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 829bb09447..527180b522 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2019 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -872,6 +873,53 @@ It has been modified to remove all non-free binary blobs.") #:defconfig "omap2plus_defconfig" #:extra-version "arm-omap2plus")) +;; Distribute a patched version of deblob-5.5 to accomodate for +;; the file rename +;; drivers/crypto/ccp/psp-dev.c -> drivers/crypto/ccp/sev-dev.c +(define (deblob-scripts-pinebook-pro version) + (list (version-major+minor version) + (origin + (method url-fetch) + (uri (string-append "https://lilypond.org/janneke/pinebook-pro/" + "deblob-pinebook-pro-" + (version-major+minor version))) + (file-name (string-append "deblob-" (version-major+minor version))) + (sha256 + (base32 "15xpmn93mibgh3zlmbzfxx6hfk6y7vrwqc46gx7r87hrwhg0q4hj"))) + (origin + (method url-fetch) + (uri (string-append "https://linux-libre.fsfla.org" + "/pub/linux-libre/releases/" version "-gnu/" + "deblob-check")) + (sha256 + (base32 "12v9n7qf67vilwi2bkzbn1sbamhaw60rk79v3y2lm8bprgpy958l"))))) + +;; This is apparently the least patched kernel (people call it "mainline", +;; although it's not upstream), at the moment (Fri Feb 14 2020). The exact +;; version, branching, patchset is as yet unclear to me; the repository comes +;; without any tags or upstream branches. +(define-public linux-libre-pinebook-pro + (let* ((version "5.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.manjaro.org/tsys/linux-pinebook-pro.git") + (commit "9564c96de3d1e7a19fbfed075333bf414fa1749f"))) + (file-name (git-file-name "linux-libre-pinebook-pro" version)) + (sha256 + (base32 + "0q4mrjvv7bpavd5r8k9njm0md0lymwcnjpd9nggb8vwffdgbchys")))) + (pristine-source (make-linux-libre-source + "5.5.0-pinebook-pro" source + (deblob-scripts-pinebook-pro version)))) + (make-linux-libre* + version + pristine-source + '("aarch64-linux") + #:defconfig "pinebook_pro_defconfig" + #:extra-version "pinebook-pro"))) + ;;; ;;; Linux kernel modules.