From patchwork Sun Jun 22 13:45:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 362561 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id B79AA14008F for ; Sun, 22 Jun 2014 23:50:06 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6A79C89670; Sun, 22 Jun 2014 13:50:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9UGFPQsMwK9z; Sun, 22 Jun 2014 13:50:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E17B889682; Sun, 22 Jun 2014 13:49:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 097811BF97E for ; Sun, 22 Jun 2014 13:49:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DB603248D1 for ; Sun, 22 Jun 2014 13:49:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8vra2c3R914i for ; Sun, 22 Jun 2014 13:49:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by silver.osuosl.org (Postfix) with ESMTPS id 67ECF26268 for ; Sun, 22 Jun 2014 13:49:49 +0000 (UTC) Received: by mail-wg0-f50.google.com with SMTP id x13so5464957wgg.21 for ; Sun, 22 Jun 2014 06:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:content-transfer-encoding:subject :message-id:in-reply-to:references:user-agent:date:from:to; bh=BHXSiXvubGc2bLEeduMX0F/aYQuPD+8FeBsPIXG/rlI=; b=XYqPqTqLya55U+uVWlv3MX+Oe8jBjLdiXffpsDzgnLluNLCvBnGLzf8F/OXtXG+LX/ sAZWZmovCn9p1rrKtxd6vJo6ECHvfp+mtQi7O00qLDS/v6AL/brcAnTIdU7z/2+DFt25 ZOaHB8Hhi1dMQcFnd8ChobFQPGWqpIt6VqWfgkx+T4KZ4jLJTyGV6qpNHTQeN4H5Sx9b L3RH21TXwjP6jfy1/IzoleXDjZ7HO5bcHLjuHGPf+PPwKzRXhGTGqY3DRZvF5vlV15YF dVp+8Iwklkrnhbb6fJGrt1++Qp4wm256jq5ohCv3moIGKTK/zY6OqS7id9PMPwe2Pj8F LWug== X-Received: by 10.194.238.134 with SMTP id vk6mr19960647wjc.93.1403444987315; Sun, 22 Jun 2014 06:49:47 -0700 (PDT) Received: from [127.0.0.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id dj2sm23744618wib.11.2014.06.22.06.49.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jun 2014 06:49:46 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: 5dc5438c0108ca50301288793f51e6572966efdf Message-Id: <5dc5438c0108ca503012.1403444743@localhost> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.7.2 Date: Sun, 22 Jun 2014 15:45:43 +0200 From: Thomas De Schampheleire To: buildroot@buildroot.org Subject: [Buildroot] [PATCH 4 of 5 RFC] busybox: menuconfig: take into account initial settings from config file 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net When busybox-menuconfig is executed from a clean repo, and a custom configuration file was set, then these custom settings are ignored and busybox starts from the default configuration. This patch adds an explicit copy of the custom config file to the menuconfig target to fix 'make clean busybox-menuconfig'. Signed-off-by: Thomas De Schampheleire Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" --- package/busybox/busybox.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff -r 6bb6b3f59fd5 -r 5dc5438c0108 package/busybox/busybox.mk --- a/package/busybox/busybox.mk Sun Jun 22 15:29:01 2014 +0200 +++ b/package/busybox/busybox.mk Sun Jun 22 15:33:49 2014 +0200 @@ -232,6 +232,7 @@ $(eval $(generic-package)) busybox-menuconfig busybox-xconfig busybox-gconfig: busybox-patch + $(BUSYBOX_COPY_CONFIG) $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(BUSYBOX_DIR) \ $(subst busybox-,,$@) rm -f $(BUSYBOX_DIR)/.stamp_built