From patchwork Tue May 31 05:23:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasun Maiti X-Patchwork-Id: 1637194 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Yb9i5pFi; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=OQTGlNGs; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LC18P12vTz9s1l for ; Tue, 31 May 2022 15:30:40 +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:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=C3M4B65gB/fz2Pq8ZQdP4Bl4UghhHBJtahuyJeXssVU=; b=Yb9i5pFi5pW12Q JK0Xsw71EbX6gG+IkIbusGYzhHz9FrzKFz/8RsAHI3vVvXr1+5hy3hITUm71T2J5asWg+jhRJnwPf Oy/bIQs9IBUPUVn1CsjRFkQJtC5hWSXwLJpQBAISfbD3RAdUm1enJCTxtXA2a+MZGpuMcRb8t9pZz wZqOllW2EdyuictHEXlJauv6h6X2vCwMJp3UmUNZG6EZx7KncD5PyVq4f3TJcBdqEH5O9CWBKKttV r2SmO+4cIbmK+EE0bAl17pqwNTJ5lBVni5sa+mnmyfEs3EgdE4Pb8FrjqV1TTNL902LHcQp3tMdfs 03jw3l3Z8PtsmOpDgU2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvuMO-009Lcy-0f; Tue, 31 May 2022 05:24:04 +0000 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvuMH-009LcQ-CP for openwrt-devel@lists.openwrt.org; Tue, 31 May 2022 05:23:58 +0000 Received: by mail-pf1-x435.google.com with SMTP id w21so1056605pfc.0 for ; Mon, 30 May 2022 22:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=jviZgkYH3TVUQhpdgJHQxEn3/c0b1rnFAYCEaslitlQ=; b=OQTGlNGsQSpnWSy0I2UkBMi+p3dDY2yYAAqkpd+mS0tF841shvc4Xab/tiMUiKr6Qa WF4d90k80eCu2TuSziN9XVcN281J3tPSnfyeEd0CHsCwTVnZYDCjQ1byDI0bz3AJ1dzN id7UEjMpYvHh5ZqOKjElaLSrDXH/DGEf5diPw+Lkdh31YUZ3Ebhw9blo3g7K2dCaNI6i 59wpocTMXb3K6F/EzL9tD5jryJf4G/NOp6ygZdtTxpU+vIOj8i0hc+FQm259drmOq+rl HhS5BYa9Y48MUR1ZOZneCVQ3XAsU8oOnBo2odZ0awB3idu+Pe9XPp+xgQiGisf3f9h61 Z3Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=jviZgkYH3TVUQhpdgJHQxEn3/c0b1rnFAYCEaslitlQ=; b=LnoUCiRvAs+tEXC6LGnMLAZ9xhDU3ot/fKuVD9/52mlX9nXBack+dfwNwVW6/hOkBN kIRiwZjwUn4ixuCxWQTgBW91mEzrOxi6UyY3xVZaJSgPK17mcmU1Zicp6Vx/sUuY680+ iWpO/4t8Vw7Nnwqfj4D5+6pGhSqzdYIMzAjLBOp3OW8PtWwC9o9X6WfDZr1YjCU8afD/ QrGSeV7Xy0Ht38RaUXVVmpO7BBI0TMR13jQhzccQfet/CFpwA70kJLhP05nETxr+G6J0 Oi+FtMVFAE3O2a1PmC7NwASg185eX10i3xzTuAT7zPXZ4lU6jevcpWUJjAyLB/OOQcFD M+dA== X-Gm-Message-State: AOAM530o8vg+Y3RXcmbxCOmPCqVH6K89VZJ640Eti/G6+6WdrHX6p0Rg 24xcN6rfnFLTCvw2NE2jigE0LraLvqk= X-Google-Smtp-Source: ABdhPJxS7fmngJkuxSgSjBMgIn5S1JV3zFU1cGHHkr2927eONP4PZ8JGX5/+ujLbzCpybJSYaDFVLQ== X-Received: by 2002:a65:64d9:0:b0:3fc:5285:5d63 with SMTP id t25-20020a6564d9000000b003fc52855d63mr1817910pgv.456.1653974635337; Mon, 30 May 2022 22:23:55 -0700 (PDT) Received: from BALT-PMAITI.maxlinear.com ([45.112.241.89]) by smtp.gmail.com with ESMTPSA id q141-20020a632a93000000b003db8f00aba0sm9600090pgq.0.2022.05.30.22.23.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 22:23:54 -0700 (PDT) From: Prasun Maiti To: OpenWrt Development List Subject: Handle target path located under target/linux/feeds/ Date: Tue, 31 May 2022 10:53:33 +0530 Message-Id: <20220531052333.797-1-prasunmaiti87@gmail.com> X-Mailer: git-send-email 2.36.0.windows.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220530_222357_482844_295E99A3 X-CRM114-Status: GOOD ( 10.58 ) X-Spam-Score: 1.9 (+) 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: When we are installing targets to target/linux/feeds, BOARD is not located under target/linux/ So, we need to handle this scenario taking proper target path Signed-off-by: Prasun Maiti --- config/Config-images.in | 1 + include/target.mk | 3 +++ package/kernel/linux/Makefile | 4 ++-- target/linux/Makefile | 2 +- 4 files changed, 7 insertions(+), 3 deleti [...] Content analysis details: (1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:435 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [prasunmaiti87[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [prasunmaiti87[at]gmail.com] -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.8 LONGWORDS Long string of long words 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 When we are installing targets to target/linux/feeds, BOARD is not located under target/linux/ So, we need to handle this scenario taking proper target path Signed-off-by: Prasun Maiti --- config/Config-images.in | 1 + include/target.mk | 3 +++ package/kernel/linux/Makefile | 4 ++-- target/linux/Makefile | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/Config-images.in b/config/Config-images.in index dcd7575..832e672 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -286,6 +286,7 @@ menu "Target Images" comment "Image Options" source "target/linux/*/image/Config.in" + source "target/linux/feeds/*/image/Config.in" config TARGET_KERNEL_PARTSIZE int "Kernel partition size (in MiB)" diff --git a/include/target.mk b/include/target.mk index f595de6..8917f71 100644 --- a/include/target.mk +++ b/include/target.mk @@ -70,6 +70,9 @@ endif target_conf=$(subst .,_,$(subst -,_,$(subst /,_,$(1)))) ifeq ($(DUMP),) PLATFORM_DIR:=$(TOPDIR)/target/linux/$(BOARD) + ifeq ("$(wildcard $(PLATFORM_DIR))", "") + PLATFORM_DIR:=$(TOPDIR)/target/linux/feeds/$(BOARD) + endif SUBTARGET:=$(strip $(foreach subdir,$(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk)),$(if $(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(subdir))),$(subdir)))) else PLATFORM_DIR:=${CURDIR} diff --git a/package/kernel/linux/Makefile b/package/kernel/linux/Makefile index 9fa68d7..0cb2911 100644 --- a/package/kernel/linux/Makefile +++ b/package/kernel/linux/Makefile @@ -12,7 +12,7 @@ PKG_NAME:=kernel PKG_FLAGS:=hold PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages -SCAN_DEPS=modules/*.mk $(TOPDIR)/target/linux/*/modules.mk $(TOPDIR)/include/netfilter.mk +SCAN_DEPS=modules/*.mk $(patsubst %/$(BOARD),%,$(PLATFORM_DIR))/*/modules.mk $(TOPDIR)/include/netfilter.mk PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:= @@ -63,4 +63,4 @@ endef $(eval $(if $(DUMP),,$(call BuildPackage,kernel))) include $(sort $(wildcard ./modules/*.mk)) --include $(TOPDIR)/target/linux/*/modules.mk +-include $(patsubst %/$(BOARD),%,$(PLATFORM_DIR))/*/modules.mk diff --git a/target/linux/Makefile b/target/linux/Makefile index a939d42..a6ea788 100644 --- a/target/linux/Makefile +++ b/target/linux/Makefile @@ -8,4 +8,4 @@ include $(INCLUDE_DIR)/target.mk export TARGET_BUILD=1 prereq clean download prepare compile install oldconfig menuconfig nconfig xconfig update refresh: FORCE - @+$(NO_TRACE_MAKE) -C $(BOARD) $@ + @+$(NO_TRACE_MAKE) -C $(PLATFORM_DIR) $@