From patchwork Sat Nov 13 10:49:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34424 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 3605527BBE3; Sat, 13 Nov 2021 10:50: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.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 094F627BBE1 for ; Sat, 13 Nov 2021 10:50:10 +0000 (GMT) Received: from localhost ([::1]:45108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlqbp-0003rd-7U for patchwork@mira.cbaines.net; Sat, 13 Nov 2021 05:50:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlqbi-0003rS-2Z for guix-patches@gnu.org; Sat, 13 Nov 2021 05:50:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlqbh-0008SS-QO for guix-patches@gnu.org; Sat, 13 Nov 2021 05:50:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mlqbh-0002XC-O7 for guix-patches@gnu.org; Sat, 13 Nov 2021 05:50:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51771] [PATCH 2/2] gnu: Add linux-libre-with-waydroid. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Nov 2021 10:50: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.16368005859710 (code B ref 51771); Sat, 13 Nov 2021 10:50:01 +0000 Received: (at 51771) by debbugs.gnu.org; 13 Nov 2021 10:49:45 +0000 Received: from localhost ([127.0.0.1]:46633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlqbR-0002WY-0o for submit@debbugs.gnu.org; Sat, 13 Nov 2021 05:49:45 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:55268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlqbM-0002WC-Np for 51771@debbugs.gnu.org; Sat, 13 Nov 2021 05:49:43 -0500 Date: Sat, 13 Nov 2021 10:49:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1636800570; bh=nwQEELNWtC2iKdAb8XWgJOrqknjVFrN+v+LW3nnDIWg=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=OI7H/oazZBrxPGwgHTzBOFFDAPlNQtLFEmY+kl5H497qMHRXnjoE4Et1iraRvqHT5 NxoMmdbPUye3uvGzOyOLIh6wv8LwT3InOjzIH6iT7EBO8O4TMGoiPCoER0FGfTMNMs SF6BC0syKtSAWeSxVaNq1vtrT5hzVsS/qKIEf+8g= Message-ID: In-Reply-To: References: 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 [PATCH v2 1/2] gnu: linux: Support numbers and strings in options. * 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..cfc09580a3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -724,12 +724,16 @@ (define %bpf-extra-linux-options (define (config->string options) (string-join (map (match-lambda - ((option . 'm) - (string-append option "=m")) - ((option . #t) - (string-append option "=y")) ((option . #f) - (string-append option "=n"))) + (format #f "# ~a is not set" option)) + ((option . #t) + (format #f "~a=y" option)) + ((option . 'm) + (format #f "~a=m" option)) + ((option . (? number? value)) + (format #f "~a=~a" option value)) + ((option . (? string? value)) + (format #f "~a=\"~a\"" option value))) options) "\n"))