From patchwork Tue Mar 19 15:14:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gio--- via openwrt-devel X-Patchwork-Id: 1913625 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=QCkaPc3J; 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 4Tzb0p1Zn6z1yWs for ; Wed, 20 Mar 2024 02:16:41 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type:List-Help: Reply-To:List-Archive:List-Unsubscribe:List-Subscribe:From:List-Post:List-Id: Message-ID:MIME-Version:Date:Subject:To:Cc:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=uMSjCnPSAnrMLdIRLf0wTJiaA8JaN6nxy4xCOgn+YI4=; b=QCkaPc3JHUgaxBl7eFCwJQZsEQ 8W5DrWp292zwJ4TEWfaMjND+7tXK/P/yVx9qaxmNtpMnxogNWPBRIFmVlt7k4YjxuLq86ZwIqyexA oZnINY1E0gy9Kwk89cvcDBJ3YkI/bxNGJnesyLStOauTq+K43SJDJIAC4Gzwencc8SxCupGAklQe7 fbe2679COvp4QX7edWf9vd1CsMLq06dzDELzU7RcVJkDWjgzqeVcz0dSub2caaXG5WNKmwQSZQX+g aS/3GZgf6LxStuul/i44zZ9XiLJ1N1njMEtpipWm2QCwoOut+UTAMd9CMvTWeJkN0JttXeOg0CQxW Aq5ltxiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rmbAs-0000000D6ZK-0Tjh; Tue, 19 Mar 2024 15:14:46 +0000 To: openwrt-devel@lists.openwrt.org Subject: [PATCH] imagebuilder: fix build if the target is sourced from a feed Date: Tue, 19 Mar 2024 16:14:12 +0100 MIME-Version: 1.0 Message-ID: List-Id: OpenWrt Development List List-Post: X-Patchwork-Original-From: Thomas Richard via openwrt-devel From: gio--- via openwrt-devel Precedence: list X-Mailman-Version: 2.1.34 X-BeenThere: openwrt-devel@lists.openwrt.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: thomas.richard@bootlin.com List-Help: Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. From: Thomas Richard If a target is sourced from a feed, an error occurs during the build of the imagebuilder. It fails to find the target directory. To fix the issue, add a check to test if the target is in the feed directory. Signed-off-by: Thomas Richard --- target/imagebuilder/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index c3b6c9c10c..0fd830020c 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -80,7 +80,12 @@ endif $(CP) -L $(TOPDIR)/target/linux/Makefile $(PKG_BUILD_DIR)/target/linux $(CP) -L $(TOPDIR)/target/linux/generic $(PKG_BUILD_DIR)/target/linux - $(CP) -L $(TOPDIR)/target/linux/$(BOARD) $(PKG_BUILD_DIR)/target/linux + if [ -d $(TOPDIR)/target/linux/feeds/$(BOARD) ]; then \ + $(INSTALL_DIR) $(PKG_BUILD_DIR)/target/linux/feeds; \ + $(CP) -L $(TOPDIR)/target/linux/feeds/$(BOARD) $(PKG_BUILD_DIR)/target/linux/feeds/; \ + else \ + $(CP) -L $(TOPDIR)/target/linux/$(BOARD) $(PKG_BUILD_DIR)/target/linux; \ + fi if [ -d $(TOPDIR)/staging_dir/host/lib/grub ]; then \ $(CP) $(TOPDIR)/staging_dir/host/lib/grub/ $(PKG_BUILD_DIR)/staging_dir/host/lib; \ fi