From patchwork Fri Dec 27 21:18:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 305472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 8CE752C00B2 for ; Sat, 28 Dec 2013 08:18:45 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D6DA393D98; Fri, 27 Dec 2013 21:18:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Pbvs-Y7X2qwY; Fri, 27 Dec 2013 21:18:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0F8A893D9A; Fri, 27 Dec 2013 21:18:43 +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 ECFBA1C2A4E for ; Fri, 27 Dec 2013 21:18:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E6A608C16D for ; Fri, 27 Dec 2013 21:18:37 +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 oLwldY-SpRxq for ; Fri, 27 Dec 2013 21:18:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1EA928C185 for ; Fri, 27 Dec 2013 21:18:36 +0000 (UTC) Received: by mail-wi0-f175.google.com with SMTP id hi5so14684470wib.2 for ; Fri, 27 Dec 2013 13:18:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nBBGKkkdpKek7UTX/6ZqQV1Vd/j2mpCU8biT0hM961E=; b=Y0IWyLN7kBwLezaztsELAhyrCA4Q/GrBlR0VO+4CA7dxp2DToZBOWj5unhz/LqcAek KkSfGiF17ImLuMbpCVa5JUkeYshv8tFfJhNHsJev540Nf8KbAESmJIf5DndgxZqjkEnr f9ygjfi3DKrOvQb4czDzayLWtmCr7QuoGJFbasET25v8nlYZ6EJ9htt3fwrjCw3cETBw tfQ1ZJ8qcPXfzBCKQGkHtsuAsjTYbwxVuVAbo/xIkjeMpNrUgBOG7DfUcFaH5VVgBsgL 5CtNGUe81fxUE5EE6eG/sZaCY4Iw+0fyQSrj6USszp1NFx751+KLVe/Bp19AL9nRFBnz S0Sg== X-Received: by 10.194.20.130 with SMTP id n2mr11043198wje.62.1388179115645; Fri, 27 Dec 2013 13:18:35 -0800 (PST) Received: from cerise.lan (13-105-190-109.dsl.ovh.fr. [109.190.105.13]) by mx.google.com with ESMTPSA id v7sm34762939wix.5.2013.12.27.13.18.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Dec 2013 13:18:35 -0800 (PST) From: Maxime Hadjinlian To: buildroot@busybox.net Date: Fri, 27 Dec 2013 22:18:29 +0100 Message-Id: <1388179109-23491-3-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1388179109-23491-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1388179109-23491-1-git-send-email-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH 2/2] support/kconfig: Fix remaining 'kernel' mention 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 This patch update the patch for kernel's kconfig to add remaining 'kernel' mention. It also applies this patch to buildroot's kconfig. Signed-off-by: Maxime Hadjinlian --- support/kconfig/mconf.c | 2 +- .../patches/01-kconfig-kernel-to-buildroot.patch | 54 +++++++++++++++------- support/kconfig/qconf.cc | 2 +- 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/support/kconfig/mconf.c b/support/kconfig/mconf.c index c3a4d4d..7d6cf80 100644 --- a/support/kconfig/mconf.c +++ b/support/kconfig/mconf.c @@ -959,7 +959,7 @@ static int handle_exit(void) if (conf_get_changed()) res = dialog_yesno(NULL, _("Do you wish to save your new configuration?\n" - "(Press to continue kernel configuration.)"), + "(Press to continue Buildroot configuration.)"), 6, 60); else res = -1; diff --git a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch index 25b436b..6f545e2 100644 --- a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch +++ b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch @@ -6,10 +6,10 @@ zconf.y | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) -Index: b/gconf.glade +Index: kconfig/gconf.glade =================================================================== ---- a/gconf.glade -+++ b/gconf.glade +--- kconfig.orig/gconf.glade 2013-12-27 22:14:32.395629843 +0100 ++++ kconfig/gconf.glade 2013-12-27 22:14:32.387630158 +0100 @@ -4,7 +4,7 @@ @@ -19,11 +19,11 @@ Index: b/gconf.glade GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False -Index: b/mconf.c +Index: kconfig/mconf.c =================================================================== ---- a/mconf.c -+++ b/mconf.c -@@ -178,9 +178,9 @@ +--- kconfig.orig/mconf.c 2013-12-27 22:14:32.395629843 +0100 ++++ kconfig/mconf.c 2013-12-27 22:14:42.179244153 +0100 +@@ -176,9 +176,9 @@ "Arrow keys navigate the menu. " " selects submenus ---> (or empty submenus ----). " "Highlighted letters are hotkeys. " @@ -35,10 +35,19 @@ Index: b/mconf.c radiolist_instructions[] = N_( "Use the arrow keys to navigate this window or " "press the hotkey of the item you wish to select " -Index: b/zconf.tab.c_shipped +@@ -959,7 +959,7 @@ + if (conf_get_changed()) + res = dialog_yesno(NULL, + _("Do you wish to save your new configuration?\n" +- "(Press to continue kernel configuration.)"), ++ "(Press to continue Buildroot configuration.)"), + 6, 60); + else + res = -1; +Index: kconfig/zconf.tab.c_shipped =================================================================== ---- a/zconf.tab.c_shipped -+++ b/zconf.tab.c_shipped +--- kconfig.orig/zconf.tab.c_shipped 2013-12-27 22:14:32.395629843 +0100 ++++ kconfig/zconf.tab.c_shipped 2013-12-27 22:14:32.391630000 +0100 @@ -2297,7 +2297,7 @@ sym_init(); @@ -48,10 +57,10 @@ Index: b/zconf.tab.c_shipped if (getenv("ZCONF_DEBUG")) zconfdebug = 1; -Index: b/zconf.y +Index: kconfig/zconf.y =================================================================== ---- a/zconf.y -+++ b/zconf.y +--- kconfig.orig/zconf.y 2013-12-27 22:14:32.395629843 +0100 ++++ kconfig/zconf.y 2013-12-27 22:14:32.391630000 +0100 @@ -493,7 +493,7 @@ sym_init(); @@ -61,10 +70,10 @@ Index: b/zconf.y if (getenv("ZCONF_DEBUG")) zconfdebug = 1; -Index: b/confdata.c +Index: kconfig/confdata.c =================================================================== ---- a/confdata.c -+++ b/confdata.c +--- kconfig.orig/confdata.c 2013-12-27 22:14:32.395629843 +0100 ++++ kconfig/confdata.c 2013-12-27 22:14:32.391630000 +0100 @@ -25,7 +25,7 @@ static const char *conf_filename; static int conf_lineno, conf_warnings, conf_unsaved; @@ -83,3 +92,16 @@ Index: b/confdata.c return name ? name : ".config"; } +Index: kconfig/qconf.cc +=================================================================== +--- kconfig.orig/qconf.cc 2013-12-27 22:12:15.825013567 +0100 ++++ kconfig/qconf.cc 2013-12-27 22:14:57.826627300 +0100 +@@ -70,7 +70,7 @@ + } + + ConfigSettings::ConfigSettings() +- : QSettings("kernel.org", "qconf") ++ : QSettings("buildroot.org", "qconf") + { + } + diff --git a/support/kconfig/qconf.cc b/support/kconfig/qconf.cc index 9d3b04b..f630567 100644 --- a/support/kconfig/qconf.cc +++ b/support/kconfig/qconf.cc @@ -70,7 +70,7 @@ static inline QString qgettext(const QString& str) } ConfigSettings::ConfigSettings() - : QSettings("kernel.org", "qconf") + : QSettings("buildroot.org", "qconf") { }