From patchwork Wed Aug 16 18:28:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1822012 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=EzY41lPf; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=terefe.re header.i=@terefe.re header.a=rsa-sha256 header.s=default header.b=KzzQ8R7c; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RQxYs4h72z1yNm for ; Thu, 17 Aug 2023 04:32:01 +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=op3wzxiWnIYJ3VlcL/W54ZqTZyXNdi7IM64k/9kGk5A=; b=EzY41lPft0rqLT SKjfvYk7Ud4NGc8xZuUp1EzrMxTqClqwlDJ/3/FYLx9KzlQd50GhFdWEZ4Q5cAe1hWJV6QDCA3jVX +TiIuYvI6NZ3LcMPcxHkw059R+4cZ8im+kOqWmz+EZw0HITUcP+md/4Ef7R+Tbtok58B6KiHCJ6sN uIFNT1Hx3lLH39Av401A6qi9TeYRM1oWniUAcqCsCK3XftpHZsZyGlRVSmHFj3AqfSBYL6n+Bgt/O I5TIcmoAbFQa9PXm2LE1FAd4XJ0pOa/zjRqP4ZmidULqSfnN+lv7f9+KTn3TMMMjIgwTYNl0tf4W3 9GlmT791zfPEIaoakcPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWLGQ-004nwK-35; Wed, 16 Aug 2023 18:29:02 +0000 Received: from [2a04:52c0:101:a4a::1] (helo=terefe.re) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qWLGN-004nvZ-0y for openwrt-devel@lists.openwrt.org; Wed, 16 Aug 2023 18:29:01 +0000 Received: from localhost.localdomain (unknown [212.106.161.94]) by terefe.re (Postfix) with ESMTPSA id C812D1FFC3; Wed, 16 Aug 2023 20:28:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=terefe.re; s=default; t=1692210532; bh=dB8EcR3u0ccYY7PkMrjtpQlSZb/Du5WAAryyvEEQTqU=; h=From:To:Cc:Subject:Date:From; b=KzzQ8R7ccIiM8WzVZZBdTkndlTyVIi4uE66+fCVHplL/sXm48EETWe7JxF2aV49jp 0IqqanlNBH3+fgQEr4YY6HTcO//Vlk2eaXJQJngwr34J7DqwA1210OFPIS+Haz3orT /SZPUkJB1fvMsihfxgQSa2nyy1RMzA4hKtYFJq9BVM/04wKgRe2mKrusq01WGjDv3L iJL69VgBAvRWv+Py3dU7m9S3/8gp5YlV7vJGyDqj1JIuHscKt4iTCVEkKwaTbPPB5H 0/lUUreYp9kNpboG3NZ+I/9ADJnZbdNTdRcPikbmV14RuTYIOtE1xhaDFbErlgwFJH 2A9IgOFNySLzg== From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Cc: Tomasz Maciej Nowak Subject: [PATCH 22.03] ath79: image: allow changing kernel option in mkubntimage Date: Wed, 16 Aug 2023 20:28:01 +0200 Message-ID: <20230816182845.7705-1-tmn505@terefe.re> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230816_112859_786910_B2738BCF X-CRM114-Status: UNSURE ( 7.27 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.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: From: Tomasz Maciej Nowak Backport didn't include changes to mkubntimage invocation, which allowed to pass arguments. This in result produces broken routerstation factory images, which have kernel embedded as kernel partition [...] Content analysis details: (1.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS 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 From: Tomasz Maciej Nowak Backport didn't include changes to mkubntimage invocation, which allowed to pass arguments. This in result produces broken routerstation factory images, which have kernel embedded as kernel partition instead of LZMA loader. Fixes: #13260 Fixes: 8e09f9ffc3cc ("ath79: switch some RedBoot based devices to OKLI loader") Signed-off-by: Tomasz Maciej Nowak --- target/linux/ath79/image/common-ubnt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/image/common-ubnt.mk b/target/linux/ath79/image/common-ubnt.mk index 625f0b4f3f12..76d6de000ba6 100644 --- a/target/linux/ath79/image/common-ubnt.mk +++ b/target/linux/ath79/image/common-ubnt.mk @@ -10,7 +10,7 @@ UBNT_REVISION := $(VERSION_DIST)-$(REVISION) define Build/mkubntimage -$(STAGING_DIR_HOST)/bin/mkfwimage -B $(UBNT_BOARD) \ -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ - -k $(IMAGE_KERNEL) -r $@ -o $@ + -k $(if $(1),$(1),$(IMAGE_KERNEL)) -r $@ -o $@ endef define Build/mkubntimage2