From patchwork Sun Jul 29 15:59:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tzu-Jung Lee X-Patchwork-Id: 173926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 323D72C007E for ; Mon, 30 Jul 2012 02:00:33 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DD36C8EFEC; Sun, 29 Jul 2012 16:00:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DH6IQO0yRlcL; Sun, 29 Jul 2012 16:00:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BEFED8F051; Sun, 29 Jul 2012 16:00:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 17A6E8F791 for ; Sun, 29 Jul 2012 16:00:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ACF2B8DD75 for ; Sun, 29 Jul 2012 16:00:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j4cNSMzt7YGP for ; Sun, 29 Jul 2012 16:00:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pb0-f43.google.com (mail-pb0-f43.google.com [209.85.160.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 975D08EFEC for ; Sun, 29 Jul 2012 16:00:11 +0000 (UTC) Received: by mail-pb0-f43.google.com with SMTP id wz7so12346976pbc.16 for ; Sun, 29 Jul 2012 09:00:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=7zlAaqdGdWc31o6Uyemy/jheuxyfavgJlGwZv8UOzIw=; b=sSBrZatQIgg1W2k2y1vOWWdUrk+6K3qoL7icBOIj8a/4tOdAyOIIdjVBiWLm4mN/AC Dn11AeM7r8baC3jDhDbI+Evnh7Gt0/+9y+/rKqtORyOqZwp61u7kKIs09S9/ROpivJLc zxT9Sogn7FHe55weEbLMPR6w5VJ/wmWyWiROVYypmiaYAfLGcPzw4Vvlm58jR+SnjJFs WVELCAQoZaMlxedbq+ASbop9urriLjO+xxNZkc/Wx0TZTKHL/YQP+CM8ytkSUSXgPSNf Qt6Qxu0ZR2IXy+q9WkJpN58Ao6Tuhvh+mHmTZxuXIqp4TRIRqsPxH5p7ufGkLzYT04Gs EYow== Received: by 10.66.76.106 with SMTP id j10mr18687795paw.51.1343577611400; Sun, 29 Jul 2012 09:00:11 -0700 (PDT) Received: from localhost.localdomain (114-25-183-51.dynamic.hinet.net. [114.25.183.51]) by mx.google.com with ESMTPS id ru4sm6038124pbc.66.2012.07.29.09.00.08 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 29 Jul 2012 09:00:10 -0700 (PDT) From: Tzu-Jung Lee To: buildroot@busybox.net Date: Sun, 29 Jul 2012 23:59:50 +0800 Message-Id: <1343577590-14362-2-git-send-email-roylee17@gmail.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1343577590-14362-1-git-send-email-roylee17@gmail.com> References: <1343577590-14362-1-git-send-email-roylee17@gmail.com> Subject: [Buildroot] [PATCH 2/2] config: support overlay X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Change-Id: I2c2b03ed1dde44bfb3ae6c1aaa8c548bbb3d1e9d Signed-off-by: Tzu-Jung Lee --- Makefile | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 98e1a51..665251a 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,11 @@ endif # absolute path TOPDIR:=$(shell pwd) +ifneq ($(OVERLAY_DIR),) +CONFIG_CONFIG_IN=$(OVERLAY_DIR)/Config.in +else CONFIG_CONFIG_IN=Config.in +endif CONFIG=support/kconfig DATE:=$(shell date +%Y%m%d) @@ -60,8 +64,13 @@ empty:= space:=$(empty) $(empty) ifneq ("$(origin O)", "command line") +ifneq ($(OVERLAY_DIR),) O:=output +CONFIG_DIR:=$(OVERLAY_DIR) +else +O:=$(TOPDIR)/../output CONFIG_DIR:=$(TOPDIR) +endif NEED_WRAPPER= else # other packages might also support Linux-style out of tree builds @@ -576,6 +585,10 @@ defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @mkdir -p $(BUILD_DIR)/buildroot-config @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(BR2_DEFCONFIG),=$(BR2_DEFCONFIG)) $(CONFIG_CONFIG_IN) +%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(OVERLAY_DIR)/configs/%_defconfig outputmakefile + @mkdir -p $(BUILD_DIR)/buildroot-config + @$(COMMON_CONFIG_ENV) $< --defconfig=$(OVERLAY_DIR)/configs/$@ $(CONFIG_CONFIG_IN) + %_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig outputmakefile @mkdir -p $(BUILD_DIR)/buildroot-config @$(COMMON_CONFIG_ENV) $< --defconfig=$(TOPDIR)/configs/$@ $(CONFIG_CONFIG_IN)