From patchwork Sun Apr 5 01:59:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1266466 X-Patchwork-Delegate: jow@openwrt.org Return-Path: 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=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aparcar.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=ILPPxPU1; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 48vxh54Mn2z9sPF for ; Sun, 5 Apr 2020 12:00:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=qSw1/rgcM265x13IaNYjSqBLdWZGTVJUL++qajVnnEc=; b=ILPPxPU1z7d9qo LDyfaM1Jaunrmj7XiplwpNsGSXZxSbckygV/E/N3hwVAKVqP/z+p42Jf6Et/IF0uMY+LpvfyyqpRZ 6VNyeVgOt08NzBwBbn5SqShjO72b9fkg+JpfJgZHeypgAVSC2mklmX2N0bttLgqFfLnWEvwebTPHf bd6S+yjFFQRf3+6x1B5Ry95Nmi6DHcM4avc/VcBX2KOuW+zJ3A/JhD40wpEblhkoI8eMi5sZdpIwF AkVpUSFktQFkUYJt8KoFb8Nj5UN26YvdT1B7xTRXGrdJDElALaOE11jG1Y8Ncq2AwDKm/KlDJDIH9 YRRaTt16AJS1egG3rDyQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jKuZr-00016x-Fs; Sun, 05 Apr 2020 01:59:59 +0000 Received: from relay6-d.mail.gandi.net ([217.70.183.198]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jKuZo-000166-Vu for openwrt-devel@lists.openwrt.org; Sun, 05 Apr 2020 01:59:58 +0000 X-Originating-IP: 72.234.141.215 Received: from tb.lan (udp224251uds.hawaiiantel.net [72.234.141.215]) (Authenticated sender: mail@aparcar.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 95835C0003; Sun, 5 Apr 2020 01:59:48 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Date: Sat, 4 Apr 2020 15:59:30 -1000 Message-Id: <20200405015929.736414-1-mail@aparcar.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200404_185957_162965_810B6A7D X-CRM114-Status: UNSURE ( 7.39 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.198 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH] phase1: Add JSON merging step X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The refactored JSON info files require a final merge step which sums up all created JSON info files of a target into a single `profiles.json` files. This patch adds the extra step to run `make json_overview_image_info` just before calculating the checksums so the `profiles.json` files is signed as well. Signed-off-by: Paul Spooren --- phase1/master.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/phase1/master.cfg b/phase1/master.cfg index 792f9b3..6ff827d 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -925,6 +925,14 @@ for target in targets: haltOnFailure = True )) + factory.addStep(ShellCommand( + name = "json_overview_image_info", + description = "Merging created JSON info files into profiles.json", + command=["make", "-j1", "json_overview_image_info", "V=s"], + env = MakeEnv(), + haltOnFailure = True + )) + factory.addStep(ShellCommand( name = "checksums", description = "Calculating checksums",