From patchwork Wed Jun 2 20:04:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1486863 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=ahxT4BoC; 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 4FwKql0SSCz9sCD for ; Thu, 3 Jun 2021 06:09:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=OkQZLV1erZnFYJgOYh9IqCXvyUOUnZN3Z00+DMP5j8s=; b=ahxT4BoC5BbPq5 whAa/Uvosdl1+/qFAjpsrbVyDUJ1DKnmtMvusSGTNv7UYREH97LaRz1FP/+ITBMZ7vNO424Q4u6ZH w4uJB+wwzYgz93Ebh9GC5YlXiUaXwyfKGHz5+dm1jEKt+c3lFCEfPo8qpRuRpXmf0XFq+yxVso9xD D6IlKOxGnijKZ6qWJFXXS4z8KNV/v26ko6PPdQGZGd314sHECescb2ghNPkzvaHQe17WtKPM/tSsV qJ+JU9Rm1Mvm+dGb+Y8Ywi7n6CXkxJ93pAF04wAtl7hBZ3Hl+luF/SKzvruW7lJEkrBctopxRJMnz qow39NaZ+ZvPrMtgSUdw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1loX6o-00634n-T0; Wed, 02 Jun 2021 20:04:58 +0000 Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1loX6l-00633d-34 for openwrt-devel@lists.openwrt.org; Wed, 02 Jun 2021 20:04:56 +0000 Received: from reactor.lan (udp102851uds.hawaiiantel.net [72.235.131.57]) (Authenticated sender: mail@aparcar.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPA id 8A4C8E0003; Wed, 2 Jun 2021 20:04:48 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Cc: Paul Spooren , Baptiste Jonglez Subject: [PATCH 21.02] build/json: fix IMAGE_PREFIX and DEFAULT_PACKAGES Date: Wed, 2 Jun 2021 10:04:39 -1000 Message-Id: <20210602200439.790943-1-mail@aparcar.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210602_130455_285490_FB1E2A3E X-CRM114-Status: UNSURE ( 9.02 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: These two variables where missing in the definition of DEFAULT_DEVICE_VARS which caused them to contain wrong values, messing up the resuling JSON files. This patch add the two variables IMAGE_PREFIX and DEFAULT_PACKAGES to DEFAULT_DEVICE_VARS. Content analysis details: (0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.196 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.196 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.8 UPPERCASE_50_75 message body is 50-75% uppercase 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 These two variables where missing in the definition of DEFAULT_DEVICE_VARS which caused them to contain wrong values, messing up the resuling JSON files. This patch add the two variables IMAGE_PREFIX and DEFAULT_PACKAGES to DEFAULT_DEVICE_VARS. Suggested-by: Baptiste Jonglez Signed-off-by: Paul Spooren --- include/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/image.mk b/include/image.mk index 8cfd2155f3..b6e8ab3c84 100644 --- a/include/image.mk +++ b/include/image.mk @@ -419,7 +419,7 @@ DEFAULT_DEVICE_VARS := \ DEVICE_DTS_CONFIG DEVICE_DTS_DIR DEVICE_FDT_NUM SOC BOARD_NAME \ UIMAGE_MAGIC UIMAGE_NAME \ SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \ - UBOOT_PATH IMAGE_SIZE \ + IMAGE_PREFIX DEVICE_PACKAGES UBOOT_PATH IMAGE_SIZE \ DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \ DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \ DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \