From patchwork Thu Nov 11 19:02:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34399 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 92FB627BBE3; Thu, 11 Nov 2021 19:03:09 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,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 ESMTPS id 6548027BBE1 for ; Thu, 11 Nov 2021 19:03:09 +0000 (GMT) Received: from localhost ([::1]:35522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlFLo-0005ER-J8 for patchwork@mira.cbaines.net; Thu, 11 Nov 2021 14:03:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlFLi-0005CW-VV for guix-patches@gnu.org; Thu, 11 Nov 2021 14:03:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlFLi-0003Zm-MV for guix-patches@gnu.org; Thu, 11 Nov 2021 14:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mlFLi-0007DL-E3 for guix-patches@gnu.org; Thu, 11 Nov 2021 14:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51771] [PATCH 1/2] gnu: linux: Support numbers and strings in options. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Nov 2021 19:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51771 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51771@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.163665736027695 (code B ref -1); Thu, 11 Nov 2021 19:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Nov 2021 19:02:40 +0000 Received: from localhost ([127.0.0.1]:42272 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlFLM-0007Cd-5s for submit@debbugs.gnu.org; Thu, 11 Nov 2021 14:02:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:36984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlFLK-0007CV-JK for submit@debbugs.gnu.org; Thu, 11 Nov 2021 14:02:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlFLK-000520-DB for guix-patches@gnu.org; Thu, 11 Nov 2021 14:02:38 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:10038) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlFLI-0003WO-4O for guix-patches@gnu.org; Thu, 11 Nov 2021 14:02:37 -0500 Date: Thu, 11 Nov 2021 19:02:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1636657349; bh=dq/FrSS9G4eExtVA+nekZaRbYw0/c2vXdsrIC89IkJo=; h=Date:To:From:Reply-To:Subject:From; b=RWS76s5z4mW03A/DGOmUyHQptVyt5AwdCFUbupLng4rWjQONLNc6uis7pNsz4DPfc MpZvZfBwtDrFSj9qV5fKhgS4Lsz8Ha90eWQ8Afr9nYEXQTE6kqBU7L6tAl/dKrh0JG 5eDxKI0e3jWvALFkklqzBi0flw5yOe5hgjpdnCg8= Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.134; envelope-from=phodina@protonmail.com; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, this patch should add support for waydroid which requires certain options in the kernel enabled. In order to enable the features the lambda-match has to be extended to support numbers and strings. However, the kernel compiles and I can reconfigure the system, + reboot. But I do not see /dev/binder device. Details are in the last mail. Petr * gnu/packages/linux.scm: Match numbers and strings in options. --- 2.33.0 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f386139638..ffbaed0c57 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -729,7 +729,11 @@ (define (config->string options) ((option . #t) (string-append option "=y")) ((option . #f) - (string-append option "=n"))) + (string-append option "=n")) + ((option . number) + (string-append option "=" number)) + ((option . string) + (string-append option "=\"" string "\""))) options) "\n")) From patchwork Thu Nov 11 19:04:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34400 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 10CC227BBE3; Thu, 11 Nov 2021 19:06:12 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,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 ESMTPS id 9A70827BBE1 for ; Thu, 11 Nov 2021 19:06:11 +0000 (GMT) Received: from localhost ([::1]:36560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlFOk-0006WK-Qd for patchwork@mira.cbaines.net; Thu, 11 Nov 2021 14:06:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlFOc-0006WC-7k for guix-patches@gnu.org; Thu, 11 Nov 2021 14:06:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58964) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlFOb-0003yR-Sd for guix-patches@gnu.org; Thu, 11 Nov 2021 14:06:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mlFOb-0007IQ-MV for guix-patches@gnu.org; Thu, 11 Nov 2021 14:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51771] [PATCH 2/2] gnu: Add linux-libre-with-waydroid. References: In-Reply-To: Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Nov 2021 19:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51771 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "51771@debbugs.gnu.org" <51771@debbugs.gnu.org> Received: via spool by 51771-submit@debbugs.gnu.org id=B51771.163665750927976 (code B ref 51771); Thu, 11 Nov 2021 19:06:01 +0000 Received: (at 51771) by debbugs.gnu.org; 11 Nov 2021 19:05:09 +0000 Received: from localhost ([127.0.0.1]:42277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlFNl-0007HA-J7 for submit@debbugs.gnu.org; Thu, 11 Nov 2021 14:05:09 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:32699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlFNk-0007Gv-98 for 51771@debbugs.gnu.org; Thu, 11 Nov 2021 14:05:08 -0500 Date: Thu, 11 Nov 2021 19:04:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1636657497; bh=4xkg+sbw1YMYlI7d94HvNgdBNy96UCXqW/L5tfND77Q=; h=Date:To:From:Reply-To:Subject:From; b=gNdl61wyTjaKCNUkH7f1nytWv0HYnJUu5Dz3JGrDDLGbKlsqCVt8duQtIBfBd1zKu OohbZA2q1CyLCURSAqJXFIOEwiNhRpMYk75ER8IScu7opnSboFSjBa0Nn1shhXrkgy oXIAs2USIn4n+1IYRJ9VVIsFIOyKQJIcwIyPks5I= Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (linux-libre-with-waydroid, * waydroid-extra-linux-options): New variables. --- 2.33.0 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ffbaed0c57..2ec9c88ecb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -722,6 +722,14 @@ (define %bpf-extra-linux-options ;; kheaders module ("CONFIG_IKHEADERS" . #t))) +(define %waydroid-extra-linux-options + `(;; Modules required for waydroid: + ("CONFIG_ASHMEM" . m) + ("CONFIG_ANDROID" . #t) + ("CONFIG_ANDROID_BINDER_IPC" . m) + ("CONFIG_ANDROID_BINDERFS" . #f) + ("CONFIG_ANDROID_BINDER_DEVICES" . "binder,hwbinder,vndbinder"))) + (define (config->string options) (string-join (map (match-lambda ((option . 'm) @@ -1147,6 +1155,24 @@ (define-public linux-libre-mips64el-fuloong2e `(("CONFIG_OVERLAY_FS" . m)) %default-extra-linux-options))) +(define-public linux-libre-with-waydroid + (let ((base-linux-libre + (make-linux-libre* + linux-libre-5.14-version + linux-libre-5.14-gnu-revision + linux-libre-5.14-source + '("x86_64-linux" "i686-linux" "armhf-linux" + "aarch64-linux" "riscv64-linux") + #:extra-version "linux" + #:configuration-file kernel-config + #:extra-options + (append %waydroid-extra-linux-options + %default-extra-linux-options)))) + (package + (inherit base-linux-libre) + (name "linux-libre-waydroid") + (inputs `(("cpio" ,cpio) ,@(package-inputs base-linux-libre)))))) + (define-public linux-libre-with-bpf (let ((base-linux-libre (make-linux-libre*