From patchwork Sat May 9 01:26:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Olivari X-Patchwork-Id: 470219 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2EB6F1401AD for ; Sat, 9 May 2015 11:27:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=qca.qualcomm.com header.i=@qca.qualcomm.com header.b=ZWfOo/1W; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 7C57F28424A; Sat, 9 May 2015 03:25:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 86C76280845 for ; Sat, 9 May 2015 03:25:52 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from wolverine02.qualcomm.com (wolverine02.qualcomm.com [199.106.114.251]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 9 May 2015 03:25:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1431134825; x=1462670825; h=from:to:cc:subject:date:message-id:mime-version; bh=t5wnt5Dz0c4U3n/W1SvIKVuBx/m2ILyzyi8M0yH7kdA=; b=ZWfOo/1WH9aalhRviCj9ogxJMZnfazzdOHUxsjU8h+WviTnR9Ggs6Vo5 xtxb3x49r08jB+6/eK/IeJUM64oIyIuFxkIlrcoj9kiBeCCCJfV88bQvA Mq4jMs7i9Vsfy9hAYcwWRIPGE0evLcPFkRJMTqDmlRzYdVVUTODu1OZAl w=; X-IronPort-AV: E=McAfee;i="5700,7163,7795"; a="209723212" Received: from ironmsg03-l.qualcomm.com ([172.30.48.18]) by wolverine02.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 08 May 2015 18:27:02 -0700 X-IronPort-AV: E=Sophos;i="5.13,395,1427785200"; d="scan'208";a="906084073" Received: from nasanexm01g.na.qualcomm.com ([10.85.0.33]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 08 May 2015 18:27:02 -0700 Received: from mathieu-linux.qualcomm.com (10.80.80.8) by NASANEXM01G.na.qualcomm.com (10.85.0.33) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Fri, 8 May 2015 18:27:02 -0700 From: Mathieu Olivari To: Date: Fri, 8 May 2015 18:26:51 -0700 Message-ID: <1431134811-9781-1-git-send-email-mathieu@qca.qualcomm.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01B.na.qualcomm.com (10.85.0.82) To NASANEXM01G.na.qualcomm.com (10.85.0.33) Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [Patch V2] build: don't call prereq for any package/symlinks rules X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Most of the time, we want to make sure OpenWrt has been configured and setup before start running make. However, in case of package/symlinks, forcing prereq as a dependency creates multiple issues: *when executed on a clean workspace, it will prompt for user input and open a menuconfig window before executing the feeds command *the only way around that is to provide a .config. However, the "prereq" target would then run a "make defconfig", which will remove all the packages in the .config but from external feeds, as feeds have not been installed yet. The only way to currently work around this, is to generate a fake config by running "make defconfig", then "make package/symlinks", copy the real config (which at this point disregards the previously generated config), and run make defconfig again. Something like this: make defconfig make package/symlinks cp real.config .config make defconfig This change is removing the need for the first defconfig, making the process more logical for OpenWrt users using the package/symlinks target. Signed-off-by: Mathieu Olivari --- Makefile | 14 -------------- include/toplevel.mk | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2b08d30..2499304 100644 --- a/Makefile +++ b/Makefile @@ -86,20 +86,6 @@ prepare: .config $(tools/stamp-install) $(toolchain/stamp-install) world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE $(_SINGLE)$(SUBMAKE) -r package/index -# update all feeds, re-create index files, install symlinks -package/symlinks: - $(SCRIPT_DIR)/feeds update -a - $(SCRIPT_DIR)/feeds install -a - -# re-create index files, install symlinks -package/symlinks-install: - $(SCRIPT_DIR)/feeds update -i - $(SCRIPT_DIR)/feeds install -a - -# remove all symlinks, don't touch ./feeds -package/symlinks-clean: - $(SCRIPT_DIR)/feeds uninstall -a - .PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean endif diff --git a/include/toplevel.mk b/include/toplevel.mk index d8651d9..bbeb7eb 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -193,6 +193,20 @@ else endif +# update all feeds, re-create index files, install symlinks +package/symlinks: + ./scripts/feeds update -a + ./scripts/feeds install -a + +# re-create index files, install symlinks +package/symlinks-install: + ./scripts/feeds update -i + ./scripts/feeds install -a + +# remove all symlinks, don't touch ./feeds +package/symlinks-clean: + ./scripts/feeds uninstall -a + help: cat README