From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1B11FC433F5 for ; Thu, 30 Dec 2021 20:44:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BFF11409EE; Thu, 30 Dec 2021 20:44:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hSYHuPbP6KxB; Thu, 30 Dec 2021 20:44:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 2A6AE409E3; Thu, 30 Dec 2021 20:44:43 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A08AF1BF361 for ; Thu, 30 Dec 2021 20:43:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9B52A405C8 for ; Thu, 30 Dec 2021 20:43:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7K2mfgqKKitX for ; Thu, 30 Dec 2021 20:43:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by smtp2.osuosl.org (Postfix) with ESMTPS id 5EA84405C6 for ; Thu, 30 Dec 2021 20:43:48 +0000 (UTC) Received: (Authenticated sender: thomas.petazzoni@bootlin.com) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id A4B7A20007; Thu, 30 Dec 2021 20:43:46 +0000 (UTC) Date: Thu, 30 Dec 2021 21:43:46 +0100 From: Thomas Petazzoni To: "Yann E. MORIN" Message-ID: <20211230214346.737c0310@windsurf> In-Reply-To: <57e124aa10e9242c88e6c2b934c68bf5c8cf0af4.1636810092.git.yann.morin.1998@free.fr> References: <57e124aa10e9242c88e6c2b934c68bf5c8cf0af4.1636810092.git.yann.morin.1998@free.fr> Organization: Bootlin X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Subject: Re: [Buildroot] [PATCH 12/16 v2] package/pkg-utils: generate proper JSON strings where they are emitted X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: buildroot@buildroot.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" On Sat, 13 Nov 2021 14:28:23 +0100 "Yann E. MORIN" wrote: > Currently, our clean-json macro does two things: > - remove excessive commas before a closing list or dictionary; > - escape the backslash. > > We are going to need the comma-drop feature of clean-json, but on a > JSON blurb where all the characters, backslash included, are already > all properly escaped, so that we do not need further escape. > > So, we drop the backslash escaping from clean-json, and use the newly > introduced mk-json-str helper in every locations where we turn a > Makefile variable into a JSON string. > > Signed-off-by: Yann E. MORIN > --- > package/pkg-utils.mk | 53 ++++++++++++++++++++++++++++---------------- > 1 file changed, 34 insertions(+), 19 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot