diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rwxr-xr-x | bin/ptxdist | 7 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | scripts/libptxdist.sh | 4 |
5 files changed, 15 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index ce7f94202..f9b092d4e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ scripts/kconfig/conf.o scripts/kconfig/lex.zconf.c scripts/kconfig/lkc_defs.h scripts/kconfig/mconf +scripts/kconfig/nconf scripts/kconfig/zconf.hash.c scripts/kconfig/zconf.tab.c scripts/kconfig/*.o diff --git a/Makefile.in b/Makefile.in index 314396e54..5ee13838c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,6 +19,8 @@ SHELL := @BASH@ export SHELL +@BUILD_NCONF_TRUE@NCONF = nconf + all: @echo "building conf and mconf ..." @CC="$(CC)" \ @@ -31,7 +33,7 @@ all: CONF_LIBS="@CONF_LIBS@" \ MCONF_LIBS="@MCONF_LIBS@" \ CURSES_LOC="@CURSES_LOC@" \ - conf mconf + conf mconf $(NCONF) @echo "done." @touch .done diff --git a/bin/ptxdist b/bin/ptxdist index a14cfdeac..ed9c28ad2 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -765,6 +765,7 @@ Setup and Project Actions: projects show available projects clone <from> <to> create a new project, cloned from <from>. + nconfig menuconfig configure the project's filesystem menuconfig kernel @@ -1410,7 +1411,7 @@ do_config() fi case "${config}" in - "menuconfig"|"oldconfig"|"allmodconfig"|"allyesconfig"|"allnoconfig") + "menuconfig"|"nconfig"|"oldconfig"|"allmodconfig"|"allyesconfig"|"allnoconfig") ;; *) echo @@ -1772,7 +1773,7 @@ parse_second() ######## *config, *setup, toolchain - menuconfig|oldconfig|allmodconfig|allyesconfig|allnoconfig) + menuconfig|nconfig|oldconfig|allmodconfig|allyesconfig|allnoconfig) do_config "${cmd}" "${@}" exit ;; @@ -2319,7 +2320,7 @@ setup_platform_continue_with_broken_config() shift case "${arg}" in - menuconfig|select) return ;; + menuconfig|nconfig|select) return ;; *) return 1 ;; esac done diff --git a/configure.ac b/configure.ac index e6620400a..162fdbb47 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,9 @@ else fi AC_SUBST(CURSES_LOC) +AM_CONDITIONAL(BUILD_NCONF, test "x$CURSES_LOC" = "x<ncurses.h>") + + AC_SYS_INTERPRETER if test "$interpval" != yes ; then AC_MSG_WARN([no diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index 421d1df31..4e896273d 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -263,6 +263,7 @@ ptxd_kconfig() { local conf="${PTXDIST_TOPDIR}/scripts/kconfig/conf" local mconf="${PTXDIST_TOPDIR}/scripts/kconfig/mconf" + local nconf="${PTXDIST_TOPDIR}/scripts/kconfig/nconf" export \ KCONFIG_NOTIMESTAMP="1" \ @@ -273,6 +274,9 @@ ptxd_kconfig() { menuconfig) "${mconf}" "${file_kconfig}" ;; + nconfig) + "${nconf}" "${file_kconfig}" + ;; oldconfig) # # In silent mode, we cannot redirect input. So use |