support: move kconfig stuff from package/config to support/kconfig

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2011-08-31 23:35:05 +02:00 committed by Peter Korsgaard
parent 59a326b934
commit 56da3859c7
57 changed files with 16 additions and 16 deletions

View File

@ -32,7 +32,7 @@ export BR2_VERSION:=2011.11-git
# absolute path # absolute path
TOPDIR:=$(shell pwd) TOPDIR:=$(shell pwd)
CONFIG_CONFIG_IN=Config.in CONFIG_CONFIG_IN=Config.in
CONFIG=package/config CONFIG=support/kconfig
DATE:=$(shell date +%Y%m%d) DATE:=$(shell date +%Y%m%d)
# Compute the full local version string so packages can use it as-is # Compute the full local version string so packages can use it as-is

View File

@ -1,15 +1,15 @@
This is a copy of the kconfig code in the kernel (currently 2.6.36-rc1) tweaked This is a copy of the kconfig code in the kernel (currently 2.6.37-rc1) tweaked
to suit Buildroot. to suit Buildroot.
To update: To update:
cp -r /usr/src/linux/scripts/kconfig package/config.new cp -r /usr/src/linux/scripts/kconfig support/kconfig.new
cd package/config.new cd support/config.new
cp -a ../config/patches ../config/README.buildroot2 . cp -a ../kconfig/patches ../kconfig/README.buildroot2 .
quilt push -a quilt push -a
# Fix any conflict # Fix any conflict
cd .. cd ..
rm -rf config rm -rf config
mv config.new config mv kconfig.new kconfig
Then verify the toplevel targets work: Then verify the toplevel targets work:
config config

View File

@ -1521,7 +1521,7 @@ int main(int ac, char *av[])
/* Determine GUI path */ /* Determine GUI path */
env = getenv(SRCTREE); env = getenv(SRCTREE);
if (env) if (env)
glade_file = g_strconcat(env, "/package/config/gconf.glade", NULL); glade_file = g_strconcat(env, "/support/kconfig/gconf.glade", NULL);
else if (av[0][0] == '/') else if (av[0][0] == '/')
glade_file = g_strconcat(av[0], ".glade", NULL); glade_file = g_strconcat(av[0], ".glade", NULL);
else else

View File

@ -2,10 +2,10 @@
util.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- util.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 116 insertions(+), 1 deletion(-) 1 file changed, 116 insertions(+), 1 deletion(-)
Index: config/util.c Index: kconfig/util.c
=================================================================== ===================================================================
--- config.orig/util.c --- kconfig.orig/util.c
+++ config/util.c +++ kconfig/util.c
@@ -29,6 +29,121 @@ @@ -29,6 +29,121 @@
return file; return file;
} }
@ -60,7 +60,7 @@ Index: config/util.c
+ if (!out) + if (!out)
+ return 1; + return 1;
+ fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n" + fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
+ "# See package/config/util.c write_make_deps()\n#\n"); + "# See support/kconfig/util.c write_make_deps()\n#\n");
+ menu = &rootmenu;//rootmenu.list; + menu = &rootmenu;//rootmenu.list;
+ while (menu) { + while (menu) {
+ sym = menu->sym; + sym = menu->sym;

View File

@ -2,16 +2,16 @@
gconf.c | 2 +- gconf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: config/gconf.c Index: kconfig/gconf.c
=================================================================== ===================================================================
--- config.orig/gconf.c --- kconfig.orig/gconf.c
+++ config/gconf.c +++ kconfig/gconf.c
@@ -1521,7 +1521,7 @@ @@ -1521,7 +1521,7 @@
/* Determine GUI path */ /* Determine GUI path */
env = getenv(SRCTREE); env = getenv(SRCTREE);
if (env) if (env)
- glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL); - glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
+ glade_file = g_strconcat(env, "/package/config/gconf.glade", NULL); + glade_file = g_strconcat(env, "/support/kconfig/gconf.glade", NULL);
else if (av[0][0] == '/') else if (av[0][0] == '/')
glade_file = g_strconcat(av[0], ".glade", NULL); glade_file = g_strconcat(av[0], ".glade", NULL);
else else

View File

@ -79,7 +79,7 @@ static int write_make_deps(const char *name)
if (!out) if (!out)
return 1; return 1;
fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n" fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
"# See package/config/util.c write_make_deps()\n#\n"); "# See support/kconfig/util.c write_make_deps()\n#\n");
menu = &rootmenu;//rootmenu.list; menu = &rootmenu;//rootmenu.list;
while (menu) { while (menu) {
sym = menu->sym; sym = menu->sym;