Răsfoiți Sursa

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>
Thomas Petazzoni 14 ani în urmă
părinte
comite
56da3859c7
57 a modificat fișierele cu 16 adăugiri și 16 ștergeri
  1. 1 1
      Makefile
  2. 0 0
      support/kconfig/.gitignore
  3. 0 0
      support/kconfig/Makefile
  4. 0 0
      support/kconfig/Makefile.br
  5. 0 0
      support/kconfig/POTFILES.in
  6. 5 5
      support/kconfig/README.buildroot2
  7. 0 0
      support/kconfig/check.sh
  8. 0 0
      support/kconfig/conf.c
  9. 0 0
      support/kconfig/confdata.c
  10. 0 0
      support/kconfig/expr.c
  11. 0 0
      support/kconfig/expr.h
  12. 0 0
      support/kconfig/foo.h
  13. 1 1
      support/kconfig/gconf.c
  14. 0 0
      support/kconfig/gconf.glade
  15. 0 0
      support/kconfig/images.c
  16. 0 0
      support/kconfig/kconfig_load.c
  17. 0 0
      support/kconfig/kxgettext.c
  18. 0 0
      support/kconfig/lex.zconf.c_shipped
  19. 0 0
      support/kconfig/lkc.h
  20. 0 0
      support/kconfig/lkc_proto.h
  21. 0 0
      support/kconfig/lxdialog/.gitignore
  22. 0 0
      support/kconfig/lxdialog/BIG.FAT.WARNING
  23. 0 0
      support/kconfig/lxdialog/check-lxdialog.sh
  24. 0 0
      support/kconfig/lxdialog/checklist.c
  25. 0 0
      support/kconfig/lxdialog/dialog.h
  26. 0 0
      support/kconfig/lxdialog/inputbox.c
  27. 0 0
      support/kconfig/lxdialog/menubox.c
  28. 0 0
      support/kconfig/lxdialog/textbox.c
  29. 0 0
      support/kconfig/lxdialog/util.c
  30. 0 0
      support/kconfig/lxdialog/yesno.c
  31. 0 0
      support/kconfig/mconf.c
  32. 0 0
      support/kconfig/menu.c
  33. 0 0
      support/kconfig/nconf.c
  34. 0 0
      support/kconfig/nconf.gui.c
  35. 0 0
      support/kconfig/nconf.h
  36. 0 0
      support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
  37. 0 0
      support/kconfig/patches/02-cpp-comments-to-c-comments.patch
  38. 0 0
      support/kconfig/patches/03-change-config-option-prefix.patch
  39. 0 0
      support/kconfig/patches/05-really-clean-everything.patch
  40. 0 0
      support/kconfig/patches/06-br-build-system-integration.patch
  41. 4 4
      support/kconfig/patches/08-make-write-deps.patch
  42. 0 0
      support/kconfig/patches/09-implement-kconfig-probability.patch
  43. 0 0
      support/kconfig/patches/10-br-build-system.patch
  44. 0 0
      support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
  45. 4 4
      support/kconfig/patches/12-fix-glade-file-path.patch
  46. 0 0
      support/kconfig/patches/14-support-out-of-tree-config.patch
  47. 0 0
      support/kconfig/patches/series
  48. 0 0
      support/kconfig/qconf.cc
  49. 0 0
      support/kconfig/qconf.h
  50. 0 0
      support/kconfig/streamline_config.pl
  51. 0 0
      support/kconfig/symbol.c
  52. 1 1
      support/kconfig/util.c
  53. 0 0
      support/kconfig/zconf.gperf
  54. 0 0
      support/kconfig/zconf.hash.c_shipped
  55. 0 0
      support/kconfig/zconf.l
  56. 0 0
      support/kconfig/zconf.tab.c_shipped
  57. 0 0
      support/kconfig/zconf.y

+ 1 - 1
Makefile

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

+ 0 - 0
package/config/.gitignore → support/kconfig/.gitignore


+ 0 - 0
package/config/Makefile → support/kconfig/Makefile


+ 0 - 0
package/config/Makefile.br → support/kconfig/Makefile.br


+ 0 - 0
package/config/POTFILES.in → support/kconfig/POTFILES.in


+ 5 - 5
package/config/README.buildroot2 → support/kconfig/README.buildroot2

@@ -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 update:
-	cp -r /usr/src/linux/scripts/kconfig package/config.new
-	cd package/config.new
-	cp -a ../config/patches ../config/README.buildroot2 .
+	cp -r /usr/src/linux/scripts/kconfig support/kconfig.new
+	cd support/config.new
+	cp -a ../kconfig/patches ../kconfig/README.buildroot2 .
 	quilt push -a
 	# Fix any conflict
 	cd ..
 	rm -rf config
-	mv config.new config
+	mv kconfig.new kconfig
 
 Then verify the toplevel targets work:
 	config

+ 0 - 0
package/config/check.sh → support/kconfig/check.sh


+ 0 - 0
package/config/conf.c → support/kconfig/conf.c


+ 0 - 0
package/config/confdata.c → support/kconfig/confdata.c


+ 0 - 0
package/config/expr.c → support/kconfig/expr.c


+ 0 - 0
package/config/expr.h → support/kconfig/expr.h


+ 0 - 0
package/config/foo.h → support/kconfig/foo.h


+ 1 - 1
package/config/gconf.c → support/kconfig/gconf.c

@@ -1521,7 +1521,7 @@ int main(int ac, char *av[])
 	/* Determine GUI path */
 	env = getenv(SRCTREE);
 	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] == '/')
 		glade_file = g_strconcat(av[0], ".glade", NULL);
 	else

+ 0 - 0
package/config/gconf.glade → support/kconfig/gconf.glade


+ 0 - 0
package/config/images.c → support/kconfig/images.c


+ 0 - 0
package/config/kconfig_load.c → support/kconfig/kconfig_load.c


+ 0 - 0
package/config/kxgettext.c → support/kconfig/kxgettext.c


+ 0 - 0
package/config/lex.zconf.c_shipped → support/kconfig/lex.zconf.c_shipped


+ 0 - 0
package/config/lkc.h → support/kconfig/lkc.h


+ 0 - 0
package/config/lkc_proto.h → support/kconfig/lkc_proto.h


+ 0 - 0
package/config/lxdialog/.gitignore → support/kconfig/lxdialog/.gitignore


+ 0 - 0
package/config/lxdialog/BIG.FAT.WARNING → support/kconfig/lxdialog/BIG.FAT.WARNING


+ 0 - 0
package/config/lxdialog/check-lxdialog.sh → support/kconfig/lxdialog/check-lxdialog.sh


+ 0 - 0
package/config/lxdialog/checklist.c → support/kconfig/lxdialog/checklist.c


+ 0 - 0
package/config/lxdialog/dialog.h → support/kconfig/lxdialog/dialog.h


+ 0 - 0
package/config/lxdialog/inputbox.c → support/kconfig/lxdialog/inputbox.c


+ 0 - 0
package/config/lxdialog/menubox.c → support/kconfig/lxdialog/menubox.c


+ 0 - 0
package/config/lxdialog/textbox.c → support/kconfig/lxdialog/textbox.c


+ 0 - 0
package/config/lxdialog/util.c → support/kconfig/lxdialog/util.c


+ 0 - 0
package/config/lxdialog/yesno.c → support/kconfig/lxdialog/yesno.c


+ 0 - 0
package/config/mconf.c → support/kconfig/mconf.c


+ 0 - 0
package/config/menu.c → support/kconfig/menu.c


+ 0 - 0
package/config/nconf.c → support/kconfig/nconf.c


+ 0 - 0
package/config/nconf.gui.c → support/kconfig/nconf.gui.c


+ 0 - 0
package/config/nconf.h → support/kconfig/nconf.h


+ 0 - 0
package/config/patches/01-kconfig-kernel-to-buildroot.patch → support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch


+ 0 - 0
package/config/patches/02-cpp-comments-to-c-comments.patch → support/kconfig/patches/02-cpp-comments-to-c-comments.patch


+ 0 - 0
package/config/patches/03-change-config-option-prefix.patch → support/kconfig/patches/03-change-config-option-prefix.patch


+ 0 - 0
package/config/patches/05-really-clean-everything.patch → support/kconfig/patches/05-really-clean-everything.patch


+ 0 - 0
package/config/patches/06-br-build-system-integration.patch → support/kconfig/patches/06-br-build-system-integration.patch


+ 4 - 4
package/config/patches/08-make-write-deps.patch → support/kconfig/patches/08-make-write-deps.patch

@@ -2,10 +2,10 @@
  util.c |  117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 116 insertions(+), 1 deletion(-)
 
-Index: config/util.c
+Index: kconfig/util.c
 ===================================================================
---- config.orig/util.c
-+++ config/util.c
+--- kconfig.orig/util.c
++++ kconfig/util.c
 @@ -29,6 +29,121 @@
  	return file;
  }
@@ -60,7 +60,7 @@ Index: config/util.c
 +	if (!out)
 +		return 1;
 +	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;
 +	while (menu) {
 +		sym = menu->sym;

+ 0 - 0
package/config/patches/09-implement-kconfig-probability.patch → support/kconfig/patches/09-implement-kconfig-probability.patch


+ 0 - 0
package/config/patches/10-br-build-system.patch → support/kconfig/patches/10-br-build-system.patch


+ 0 - 0
package/config/patches/11-use-mktemp-for-lxdialog.patch → support/kconfig/patches/11-use-mktemp-for-lxdialog.patch


+ 4 - 4
package/config/patches/12-fix-glade-file-path.patch → support/kconfig/patches/12-fix-glade-file-path.patch

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

+ 0 - 0
package/config/patches/14-support-out-of-tree-config.patch → support/kconfig/patches/14-support-out-of-tree-config.patch


+ 0 - 0
package/config/patches/series → support/kconfig/patches/series


+ 0 - 0
package/config/qconf.cc → support/kconfig/qconf.cc


+ 0 - 0
package/config/qconf.h → support/kconfig/qconf.h


+ 0 - 0
package/config/streamline_config.pl → support/kconfig/streamline_config.pl


+ 0 - 0
package/config/symbol.c → support/kconfig/symbol.c


+ 1 - 1
package/config/util.c → support/kconfig/util.c

@@ -79,7 +79,7 @@ static int write_make_deps(const char *name)
 	if (!out)
 		return 1;
 	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;
 	while (menu) {
 		sym = menu->sym;

+ 0 - 0
package/config/zconf.gperf → support/kconfig/zconf.gperf


+ 0 - 0
package/config/zconf.hash.c_shipped → support/kconfig/zconf.hash.c_shipped


+ 0 - 0
package/config/zconf.l → support/kconfig/zconf.l


+ 0 - 0
package/config/zconf.tab.c_shipped → support/kconfig/zconf.tab.c_shipped


+ 0 - 0
package/config/zconf.y → support/kconfig/zconf.y