r3178 - trunk/payloads/libpayload/util/kconfig

Author: uwe
Date: 2008-03-20 02:56:05 +0100 (Thu, 20 Mar 2008)
New Revision: 3178

Modified:
   trunk/payloads/libpayload/util/kconfig/confdata.c
   trunk/payloads/libpayload/util/kconfig/kconfig_load.c
   trunk/payloads/libpayload/util/kconfig/mconf.c
Log:
Allow 'make menuconfig' to function within libpayload.
Removes reference to BusyBox.

Signed-off-by: Christopher Kilgour 
Acked-by: Uwe Hermann

Modified: trunk/payloads/libpayload/util/kconfig/confdata.c
===================================================================
--- trunk/payloads/libpayload/util/kconfig/confdata.c	2008-03-20 01:53:30 UTC (rev 3177)
+++ trunk/payloads/libpayload/util/kconfig/confdata.c	2008-03-20 01:56:05 UTC (rev 3178)
@@ -22,7 +22,7 @@

const char conf_def_filename[] = ".config";

-const char conf_defname[] = "scripts/defconfig";
+const char conf_defname[] = "util/defconfig";

const char *conf_confnames[] = {
    ".config",

Modified: trunk/payloads/libpayload/util/kconfig/kconfig_load.c
===================================================================
--- trunk/payloads/libpayload/util/kconfig/kconfig_load.c	2008-03-20 01:53:30 UTC (rev 3177)
+++ trunk/payloads/libpayload/util/kconfig/kconfig_load.c	2008-03-20 01:56:05 UTC (rev 3178)
@@ -15,7 +15,7 @@

handle = dlopen("./libkconfig.so", RTLD_LAZY);
    if (!handle) {
-		handle = dlopen("./scripts/kconfig/libkconfig.so", RTLD_LAZY);
+		handle = dlopen("./util/kconfig/libkconfig.so", RTLD_LAZY);
    	if (!handle) {
    		fprintf(stderr, "%s\n", dlerror());
    		exit(1);

Modified: trunk/payloads/libpayload/util/kconfig/mconf.c
===================================================================
--- trunk/payloads/libpayload/util/kconfig/mconf.c	2008-03-20 01:53:30 UTC (rev 3177)
+++ trunk/payloads/libpayload/util/kconfig/mconf.c	2008-03-20 01:56:05 UTC (rev 3178)
@@ -324,7 +324,7 @@
    memset(args, 0, sizeof(args));
    indent = 0;
    child_count = 0;
-	cprint("./scripts/kconfig/lxdialog/lxdialog");
+	cprint("./util/kconfig/lxdialog/lxdialog");
    cprint("--backtitle");
    cprint(menu_backtitle);
 }
@@ -1052,7 +1052,7 @@

sym = sym_lookup("KERNELVERSION", 0);
    sym_calc_value(sym);
-	sprintf(menu_backtitle, _("BusyBox %s Configuration"),
+	sprintf(menu_backtitle, _("libpayload %s Configuration"),
    	sym_get_string_value(sym));

mode = getenv("MENUCONFIG_MODE");