From patchwork Sun Mar 21 08:58:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Oskari_Lemmel=C3=A4?= X-Patchwork-Id: 1456264 X-Patchwork-Delegate: daniel@makrotopia.org 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=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.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=desiato.20200630 header.b=qTobKBOO; dkim=fail reason="signature verification failed" (4096-bit key; unprotected) header.d=lemmela.net header.i=@lemmela.net header.a=rsa-sha256 header.s=dkim header.b=Fp6FWDSa; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (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 4F3BSw5zD8z9sRf for ; Sun, 21 Mar 2021 20:01:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=ZQNghCCSuCF/eh4gBclvBwk0oeHl8jkDAZaOZjpyMNM=; b=qTobKBOOSLow9aKJVI4Vd94Y3d caOVWdmgs9cW8ZpXiLDcGCdLhN72XyC6ftgFxpcsrjJpMR7tS2GdNkmmTadGlCQsMiC446rsEHunh GawTRmyKc6bpp0ohGlqtsM4a6qfdwX3LXXFFvAgPhhREH8W0q9i0UAk6j8M2AeyN7F3hY+bpT7P5W ZZg0JLbXx97fan6RaMhpDqAlAdRFAjggwxvvJkLS3BXK03u9EAV6uxV7q2bc6P+cj+MvZRVN2TUtS 22iBooHmNqM/77CuiC5hf8KlgjOO2FHttLEG0/SyW4qEttgXBK04K0ASyOOzbkT9xUy5Me6vWDgW2 YAVyBzzQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lNtux-009mZa-Vl; Sun, 21 Mar 2021 08:58:41 +0000 Received: from mail1.kuutio.org ([2001:41d0:701:1000::88b]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lNtuq-009mYV-Lt for openwrt-devel@lists.openwrt.org; Sun, 21 Mar 2021 08:58:34 +0000 Received: from localhost (localhost [127.0.0.1]) by mail1.kuutio.org (Postfix) with ESMTP id 20A621FD6D; Sun, 21 Mar 2021 09:58:29 +0100 (CET) Authentication-Results: mail1.kuutio.org (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=lemmela.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lemmela.net; h= content-transfer-encoding:mime-version:x-mailer:message-id:date :date:subject:subject:from:from:received:received; s=dkim; t= 1616317107; x=1618909108; bh=Vk5IjTVE4TkpsWj28HZht8SOtBeAwUU0XJP FMwhr+l0=; b=Fp6FWDSa0ISwvqshPBK0TXN4yUoB3UCUWyretJl1/c72psCeSKG ZUsSBKkMw46taYPflFnIyEqC1e+1qr6Ew64MNKcb4/oYJs8ZMYOb1wGaMF/z4PkZ JHSPKKTve0O1HK6YuN3KhOd7gQ+1Mgj00dq1YY3E55YnWQ0UiXwZsvPltEm5T7qM gabbM20xk506tJvxkUfyKE9nz5ZP6XEXsSOUhZZQ83GHq2I/LyKVFKau+mmpqJBP gPmdi2Xz78eKGn5LeEDy4sxrINBPjefdljul2X92x0IEjwMLBWcm1Su2QIgRzThI aytQ8l47V6vCGrkRUkIuDjOgT97rb+wviL6NKivaSVCOzHrL0YOVR1VNJFm9f5Ff myqe/sXGl0SZ2O5uViBpqB9tg4Ch/lziY3Le+VFzH6UFT8ThIdQ/kl/88Wf/dF9f NKm+Z1QdyniTii/ZzIiRcNVJafjI9UeSEBsYsafsJJVl31zGay8VF+6t2CDzM3SB bZnmzEFFiSR8Rxuf5o8FVH3NHonTIHuPVDUIHgJPj+I2xbNYWxs3t1j7L/7EjO3A 8+tYDrVQngQvNG6CWp8oNu8sU2oiYxR+wyeLsakgyqtU8tXyM5L9vHj/6N33kAop /Ex/fzsjh8fHru/2IKV2XEv6urxtSP1J3NvDPYQe6iCaJ9Qdi3fxLDAc= X-Virus-Scanned: amavisd-new at kuutio.org Received: from mail1.kuutio.org ([127.0.0.1]) by localhost (mail1.kuutio.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id pSu4HcYviUys; Sun, 21 Mar 2021 09:58:27 +0100 (CET) Received: from build.kuutio.org (unknown [IPv6:2001:998:13:e4::69]) by mail1.kuutio.org (Postfix) with ESMTPSA id 437DB1FBB9; Sun, 21 Mar 2021 09:58:27 +0100 (CET) From: Oskari Lemmela To: openwrt-devel@lists.openwrt.org Cc: Oskari Lemmela Subject: [PATCH] build: artifacts add dependency for builded images Date: Sun, 21 Mar 2021 10:58:10 +0200 Message-Id: <20210321085810.991690-1-oskari@lemmela.net> 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-20210321_085833_032477_EBEC1747 X-CRM114-Status: UNSURE ( 7.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "desiato.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: Add possibility to use images and initramfs in artifacts. Signed-off-by: Oskari Lemmela --- include/image.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/image.mk b/include/image.mk index 29df0938bc..8b7b2b9740 100644 --- a/include/image.mk +++ b/include/image.mk @@ -478,6 +478,7 @@ define Device/Build/initramfs $$(if $$(CONFIG_JSO [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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_AU Message has a valid DKIM or DK signature from author's domain 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 Add possibility to use images and initramfs in artifacts. Signed-off-by: Oskari Lemmela --- include/image.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/image.mk b/include/image.mk index 29df0938bc..8b7b2b9740 100644 --- a/include/image.mk +++ b/include/image.mk @@ -478,6 +478,7 @@ define Device/Build/initramfs $$(if $$(CONFIG_JSON_OVERVIEW_IMAGE_INFO), $(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,)) $(KDIR)/$$(KERNEL_INITRAMFS_NAME):: image_prepare + $(1)-images: $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE) $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE) cp $$^ $$@ @@ -570,6 +571,7 @@ define Device/Build/image $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \ $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX)) $(eval $(call Device/Export,$(KDIR)/tmp/$(call DEVICE_IMG_NAME,$(1),$(2)),$(1))) + $(3)-images: $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX) ROOTFS/$(1)/$(3) := \ $(KDIR)/root.$(1)$$(strip \ @@ -628,7 +630,7 @@ endef define Device/Build/artifact $$(_TARGET): $(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) $(eval $(call Device/Export,$(KDIR)/tmp/$(DEVICE_IMG_PREFIX)-$(1))) - $(KDIR)/tmp/$(DEVICE_IMG_PREFIX)-$(1): $$(KDIR_KERNEL_IMAGE) + $(KDIR)/tmp/$(DEVICE_IMG_PREFIX)-$(1): $$(KDIR_KERNEL_IMAGE) $(2)-images @rm -f $$@ $$(call concat_cmd,$(ARTIFACT/$(1))) @@ -651,7 +653,7 @@ define Device/Build $$(call Device/Build/image,$$(fs),$$(image),$(1))))) $$(eval $$(foreach artifact,$$(ARTIFACTS), \ - $$(call Device/Build/artifact,$$(artifact)))) + $$(call Device/Build/artifact,$$(artifact),$(1)))) endef