From patchwork Sat Mar 9 14:00:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Roederer X-Patchwork-Id: 1053839 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=geroedel.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eLmWxQQ9"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44GmHT2fPhz9s1B for ; Sun, 10 Mar 2019 01:01:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=TOIoWgkSjO7KFOMl3fVpZCQaBpxmAOdvRYXgYNujHRk=; b=eLmWxQQ9aIxfWr22I0aXUNThR2 6BlrDz6R2vN84p/HqUuKy6Rz6SZJk0otMyOIMAxYInbdkN9idOSpx/ikCyBPsg/wSneWYdmr1zWcP Sd3ar6WamSPATbbnQW2XYZWqdLTFUt2G8RlJTu8LDfUgf13BmikLdgn8GYcdwF49LMkC86fyTvVcC cGN9lDzUhZZ9kJDzUTvO133PNUTQN3z94JIOzlrtMhjowt+HA6DxJLO/SComEZUAKH4OoNp98EXiz 3HTYwEuoTFqT1VyaDrpKJy/x1qdU8PzKETANfL0IiBF8HdxCG4H9NGy82Hlg546I4KOh5gQEwOZRN tvTH7NAw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h2cWr-0008Gy-Sd; Sat, 09 Mar 2019 14:00:45 +0000 Received: from dazzle.geroedel.de ([2a02:180:6:1::b3]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h2cWo-0008GF-Bg for openwrt-devel@lists.openwrt.org; Sat, 09 Mar 2019 14:00:44 +0000 Received: from [192.168.15.2] (helo=feeble.bln.roederer.dhs.org) by dazzle.geroedel.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1h2cWX-0004pP-8q for openwrt-devel@lists.openwrt.org; Sat, 09 Mar 2019 15:00:26 +0100 Received: from build.bln.roederer.dhs.org ([192.168.8.5] helo=build) by feeble.bln.roederer.dhs.org with smtp (Exim 4.89) (envelope-from ) id 1h2cWW-0002Wb-KF for openwrt-devel@lists.openwrt.org; Sat, 09 Mar 2019 15:00:24 +0100 Received: (nullmailer pid 24167 invoked by uid 10000); Sat, 09 Mar 2019 14:00:24 -0000 From: Sven Roederer To: openwrt-devel@lists.openwrt.org Date: Sat, 9 Mar 2019 15:00:15 +0100 Message-Id: <20190309140015.24122-1-devel-sven@geroedel.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <12c7de9e-a210-2c75-40e3-65bed204df85@wwsnet.net> References: <12c7de9e-a210-2c75-40e3-65bed204df85@wwsnet.net> X-Spam_score: -2.9 X-Spam_score_int: -28 X-Spam_bar: -- X-Spam_report: Spam detection software, running on the system "dazzle", 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 @@CONTACT_ADDRESS@@ for details. Content preview: The luci and freifunk feed having a common Makefile included by the individual packages. Currently a change to this file will be ignored when running "scripts/feeds update". When we are updating for a [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-SA-Exim-Connect-IP: 192.168.15.2 X-SA-Exim-Mail-From: devel-sven@geroedel.de X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dazzle X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.2 X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on dazzle.geroedel.de) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190309_060042_548264_B30FDC02 X-CRM114-Status: UNSURE ( 3.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH v2] build: have scripts/feeds honor all toplevel .mk-files of a feed X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The luci and freifunk feed having a common Makefile included by the individual packages. Currently a change to this file will be ignored when running "scripts/feeds update". When we are updating for a feed, add a dependency for all .mk files in the root of it. Signed-off-by: Sven Roederer --- include/scan.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/scan.mk b/include/scan.mk index d9cd4f7e8c..7df5dc6486 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -12,10 +12,17 @@ OVERRIDELIST:=$(TMP_DIR)/info/.overrides-$(SCAN_TARGET)-$(SCAN_COOKIE) export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH) +define feedname +$(if $(patsubst feeds/%,,$(1)),,$(word 2,$(subst /, ,$(1)))) +endef + ifeq ($(SCAN_NAME),target) SCAN_DEPS=image/Makefile profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk image/*.mk else SCAN_DEPS=$(TOPDIR)/include/package*.mk +ifneq ($(call feedname,$(SCAN_DIR)),) + SCAN_DEPS += $(TOPDIR)/feeds/$(call feedname,$(SCAN_DIR))/*.mk +endif endif ifeq ($(IS_TTY),1) @@ -34,10 +41,6 @@ else endef endif -define feedname -$(if $(patsubst feeds/%,,$(1)),,$(word 2,$(subst /, ,$(1)))) -endef - define PackageDir $(TMP_DIR)/.$(SCAN_TARGET): $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1) $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(2)/Makefile $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(2)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(2)/$(DEP))))