Message ID | 20210108235106.29999-3-moritzwarning@web.de |
---|---|
State | Superseded |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=wgvUl1RA; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=AggNRWDG; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DCKgt44Yyz9sWD for <incoming@patchwork.ozlabs.org>; Sat, 9 Jan 2021 10:54:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sHS/WV5XU1X0r6CzttmwcUwm65vxPEJWnGWexQFgft4=; b=wgvUl1RAJgxMSL58l9Hz7pgX8 bKSkYA9DP4BCQTnBPdwucFjFGvMZd8WQVwg5oRDUkZ07iGjmt18S9PCgwiUxxYK7JaP4hurw1srn1 Y5y39HdY2Hc7jWoYiNwkDAu4b6LvbJykSNLA4JqVB1ZgO1tThGYSbOUuU2IOHW8OOw3HM48TroS7X tzXGHXOkCoJraeDs8bBzWIxbj18gjux81Xj/6kCRQoAAeMXiOaU/jkfsUW4y2xZTn9v5NKw5tIquo sLkH1AJ0yI54+piyRaZqm/QZxW/+A7S/Wol6wX3ne2iIE1x8dnZKUIbeDCRHJaGOPo55IIQqboPB1 eBJFoV1YA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ky1XB-00016b-5B; Fri, 08 Jan 2021 23:51:09 +0000 Received: from mout.web.de ([212.227.15.3]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ky1X8-00014s-9F for openwrt-devel@lists.openwrt.org; Fri, 08 Jan 2021 23:51:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1610149861; bh=8OB+PnVBRB4V9z+mXQCRbZxbd4PhJ/u7HblrLdum3Kc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=AggNRWDG3M29mwq2bonOoRQe+H8Y3pqNxmd97ZZXMIL09UcHXH2dvZjtdgDQ2cjx7 aOZGpuA7DF3ofip85KqZ8pEmmrAYRfWTayLXDHbUw9nY/oKsUsCTZcABbdwOwUTSZJ asMapGYu1tiehRKh7NABYf41nVUQl4kf/1ob8sNo= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from localhost.localdomain ([95.90.243.245]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M8iei-1ko4pl0Z6i-00C9Db; Sat, 09 Jan 2021 00:51:01 +0100 From: Moritz Warning <moritzwarning@web.de> To: openwrt-devel@lists.openwrt.org Subject: [PATCH 3/3] build/json: preserve existing profiles.json data Date: Sat, 9 Jan 2021 00:51:06 +0100 Message-Id: <20210108235106.29999-3-moritzwarning@web.de> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210108235106.29999-1-moritzwarning@web.de> References: <20210108235106.29999-1-moritzwarning@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:ySCYiZQPu4HpVk3qymetxw2lJ3ay6mtmxwr6PWCwC1XtrQMFXdE 0O+KMIEspXKcJbATsEAtQ6dK8Qu8zyIg9pOAuP2I+H7klATXBG0OmM3+n1GuZXBQTK0ZQRy E2icguE68aFJlS65COM+JhSHMFcAA85DNdrE4uXpWUHhByjtP4pISEeYGPjBTN4Epy+JceO hfn381szDHc5pmQu+uYJQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:IFjNHRYf6oA=:NrZTo/PdEkmqIamtGB1xjq 7qBrD4FKnD6QRg4/Aolhda0GS2YRFUZyqjNl1vhNRu3je5Y55eecnPrRSVt2ljNkXER7cnWPB IUVVlbBresvwWZtTJ3nWVTXTq/W/e/n1E5eeaVForu6mvuiuCSYG5HPISjSE8guX+GPe/sipR kh+0FRPLS+cdiqBO2d4hwCGZbjC6RzoL+9FvwRewaxw/tZGu+ulS4sHJvgY10EJ7Cc1U0BEjf 4L2ogXZSm1TeIP158oxaxnnH/sLp477mD6AoPGPD0FTvRcerch2uIqJy16vP/bDBW1Wq2jc1W tvVwaICh9vdVaE/ExMOpLOBeAckAVf6qjv0yw66POUOzeyVhvAAUET1BU4zrqt3ITocz+cnBS GfBUNkdCK90oIPkhPfH11a8o+47DIInsZUf7n3pCquoqM1vNBb/SHW3A9FIZjUPApIotMRUma vyFzgt6epcKemWmZbu5cH04j/Lx4bd51wy5uPe0mEWL4zdStKgYKTIgDAitYMXaee8JPB4zim OO4IuxB5XgqUwCn6ictPoMgYk06PTmdUjsuFEozMHDemcLdnuTkrjrAXdrAp7r7u67cTBmhMG r0d8WYZrRrRTAvjoRg4iAracUvrjlsxN66ikvINWhO4wSyMH6Qk4zA+xztQepmDsV07sar4qJ KRbPmThlKVDVefkjD1inmFe9Fp3qLJA2R+amgrzilTZOgG0BMdXri4h69qkdFWrfvfwC7Cnes 105AIlxHescPWESSsKPnUEQsTmrpK2imrh66YOxGCN08EWYsfBLgLlD5GgkAAQAiZzAb/Tw4J 6LJW085yG7MZB4NvaClJjCBrSgeVodHoznYfxSWtdeSgsSNytBipU0CtpkPER4q07yVeoLHS6 dUuDAF61HA4VzHLLSV3g== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210108_185106_567110_A48CC9F4 X-CRM114-Status: UNSURE ( 7.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [212.227.15.3 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [212.227.15.3 listed in wl.mailspike.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [moritzwarning[at]web.de] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Cc: Moritz Warning <moritzwarning@web.de> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
[1/3] build/json: generate json file for initramfs images
|
expand
|
diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py index 7741154f61..47b5899981 100755 --- a/scripts/json_overview_image_info.py +++ b/scripts/json_overview_image_info.py @@ -18,6 +18,10 @@ assert getenv("WORK_DIR"), "$WORK_DIR required" def get_output(work_dir): output = None + # preserve existing profiles.json file data + if output_path.is_file(): + output = json.loads(output_path.read_text()) + for json_file in work_dir.glob("*.json"): image_info = json.loads(json_file.read_text())
The OpenWrt Image Builder only builds images for one device per call. This causes the profiles.json files to only contain the data of the last device that was build. Signed-off-by: Moritz Warning <moritzwarning@web.de> --- scripts/json_overview_image_info.py | 4 ++++ 1 file changed, 4 insertions(+) -- 2.30.0