From patchwork Wed Nov 4 09:21:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sander Vanheule X-Patchwork-Id: 1393741 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=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=svanheule.net 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=LjF+Q2Bu; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=svanheule.net header.i=@svanheule.net header.a=rsa-sha256 header.s=mail1707 header.b=dgGPYxKQ; 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 4CR1Rl4y15z9sTK for ; Wed, 4 Nov 2020 20:23:47 +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=Pk1JWBgZrZd+ItoCcycokFNQD6CvP+NdXGe4LvDRugY=; b=LjF+Q2Buf65G4wqf0wk/G8nN6 w9CXqT7G4aVA1lb5CGOez7BWkJWg8hRV7WQHsNTedIHkouyP0J9v+EcAbaXh8rTuVeiEM5MP0WByN u+Q8d23E0apqaVXIaZe93BtJtbe3V4Gj2N5WsJeMlRlBZIb+KcVMrgiACG1vDefhEQAqB6VJfO43J ZzbLvF02sylh67qk19OVwqBK13xNsnz259LMljSmot7kfnomQvxZojZSIytavZSFqBApfLcC/zz9n LBQGHa7t5nBZavPYVX4w2vNn9oHzBKzQMHxffiNX19YbEPztd6tO3PUzWaa3QNL6DzAyPZm/6Bm8O kI4AUDWIQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaEzG-0007kv-Qk; Wed, 04 Nov 2020 09:21:50 +0000 Received: from polaris.svanheule.net ([84.16.241.116]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaEz8-0007h7-0K for openwrt-devel@lists.openwrt.org; Wed, 04 Nov 2020 09:21:44 +0000 Received: from terra.local.svanheule.net (unknown [IPv6:2a02:a03f:eafe:ac01:8e4a:2947:44a5:39cc]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: sander@svanheule.net) by polaris.svanheule.net (Postfix) with ESMTPSA id 2B48619A1AD; Wed, 4 Nov 2020 10:21:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svanheule.net; s=mail1707; t=1604481700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tTBXKZeXD1+m+fFIax7hIPIlxaAm0Nbs/ypeLkNMSuE=; b=dgGPYxKQZ/kagAV9sPNfTm1s9+yYnGC8cUz1AYeeC+ch4iLug9deovs7m6YHxg8qCNJ4OL XlRyC7cZ0Qax023ttj2dXBRv9OgdeOppoLlJZ4vIrS+zCYzfgW5UbVXrbkNnDzeNg0YNEy EkepBRvwIQ0BIpnEb4Uj4U9v8iIrcCc0pCier4JtLlIL1eF65eyNULNKOY4reomNhYRetf vCO6GWPk4av/TKztDk96UbWz11yHxpAzg/YGFH7H/hRU5LdQKn6XOiC9c+6Qb79/KEapPC q6CSOlbyBGl35OGwd/gGZLjMrj019NP+tWXOR1Z+SsVuxUj99ct9wQwdeodjCg== From: Sander Vanheule To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/5] build: uImage: allow override of default arguments Date: Wed, 4 Nov 2020 10:21:13 +0100 Message-Id: <20201104092117.86343-2-sander@svanheule.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201104092117.86343-1-sander@svanheule.net> References: <20200929162006.236206-1-sander@svanheule.net> <20201104092117.86343-1-sander@svanheule.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201104_042142_329544_62BE945E X-CRM114-Status: GOOD ( 12.61 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [84.16.241.116 listed in list.dnswl.org] -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_EF Message has a valid DKIM or DK signature from envelope-from 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 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sander Vanheule , Andreas Oberritter , John Crispin Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org For some build recipes, the argument to Build/uImage is used to sneak in extra arguments for mkimage, whereas this appears to have been intended to specificy the compression method only. Use the first provided word for -C to be backwards compatible with current calls to Build/uImage. Use the rest of the call arguments to override the provided defaults. Only the input file name (-d) and the output file name cannot overriden. Signed-off-by: Sander Vanheule --- include/image-commands.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 438f1e87e4..a8faefbcff 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -396,8 +396,9 @@ endef define Build/uImage mkimage -A $(LINUX_KARCH) \ -O linux -T kernel \ - -C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ - -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION))' -d $@ $@.new + -C $(word 1,$(1)) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ + -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION))' \ + $(wordlist 2,$(words $(1)),$(1)) -d $@ $@.new mv $@.new $@ endef