new config display applet, from bug 46. i've changed the name
of the applet from "config" to "bbconfig", and renamed the source filenames and symbols to match appropriately.
This commit is contained in:
parent
a39bba33c8
commit
79c142d938
6
Makefile
6
Makefile
@ -200,7 +200,7 @@ scripts/split-include: $(top_srcdir)/scripts/split-include.c
|
|||||||
scripts/mkdep -I include -- \
|
scripts/mkdep -I include -- \
|
||||||
`find $(top_srcdir) -name \*.h -print | sed -e "s,^./,,"` >> .hdepend;
|
`find $(top_srcdir) -name \*.h -print | sed -e "s,^./,,"` >> .hdepend;
|
||||||
|
|
||||||
depend dep: .depend
|
depend dep: .depend include/bbconfigopts.h
|
||||||
|
|
||||||
include/config/MARKER: depend scripts/split-include
|
include/config/MARKER: depend scripts/split-include
|
||||||
scripts/split-include include/config.h include/config
|
scripts/split-include include/config.h include/config
|
||||||
@ -219,6 +219,10 @@ include/bb_config.h: include/config.h
|
|||||||
< $< >> $@
|
< $< >> $@
|
||||||
echo "#endif" >> $@
|
echo "#endif" >> $@
|
||||||
|
|
||||||
|
include/bbconfigopts.h: .config
|
||||||
|
scripts/config/mkconfigs >include/bbconfigopts.h
|
||||||
|
|
||||||
|
|
||||||
finished2:
|
finished2:
|
||||||
$(SECHO)
|
$(SECHO)
|
||||||
$(SECHO) Finished installing...
|
$(SECHO) Finished installing...
|
||||||
|
@ -76,6 +76,9 @@
|
|||||||
#ifdef CONFIG_BASENAME
|
#ifdef CONFIG_BASENAME
|
||||||
APPLET(basename, basename_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
|
APPLET(basename, basename_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef CONFIG_BBCONFIG
|
||||||
|
APPLET(bbconfig, bbconfig_main, _BB_DIR_BIN, _BB_SUID_NEVER)
|
||||||
|
#endif
|
||||||
#ifdef CONFIG_BUNZIP2
|
#ifdef CONFIG_BUNZIP2
|
||||||
APPLET(bunzip2, bunzip2_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
|
APPLET(bunzip2, bunzip2_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
|
||||||
#endif
|
#endif
|
||||||
|
@ -231,6 +231,11 @@
|
|||||||
"\t-2\tSuppress lines unique to FILE2\n" \
|
"\t-2\tSuppress lines unique to FILE2\n" \
|
||||||
"\t-3\tSuppress lines common to both files"
|
"\t-3\tSuppress lines common to both files"
|
||||||
|
|
||||||
|
#define bbconfig_trivial_usage \
|
||||||
|
""
|
||||||
|
#define bbconfig_full_usage \
|
||||||
|
"Print the config file which built busybox\n"
|
||||||
|
|
||||||
#define cp_trivial_usage \
|
#define cp_trivial_usage \
|
||||||
"[OPTION]... SOURCE DEST"
|
"[OPTION]... SOURCE DEST"
|
||||||
#define cp_full_usage \
|
#define cp_full_usage \
|
||||||
|
@ -34,6 +34,13 @@ config CONFIG_FEATURE_CROND_CALL_SENDMAIL
|
|||||||
help
|
help
|
||||||
Support calling /usr/sbin/sendmail for send cmd outputs.
|
Support calling /usr/sbin/sendmail for send cmd outputs.
|
||||||
|
|
||||||
|
config CONFIG_BBCONFIG
|
||||||
|
bool "bbconfig"
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
The bbconfig applet will print the config file with which
|
||||||
|
busybox was built.
|
||||||
|
|
||||||
config CONFIG_CRONTAB
|
config CONFIG_CRONTAB
|
||||||
bool "crontab"
|
bool "crontab"
|
||||||
default n
|
default n
|
||||||
|
@ -27,6 +27,7 @@ MISCUTILS-y:=
|
|||||||
MISCUTILS-$(CONFIG_ADJTIMEX) += adjtimex.o
|
MISCUTILS-$(CONFIG_ADJTIMEX) += adjtimex.o
|
||||||
MISCUTILS-$(CONFIG_CROND) += crond.o
|
MISCUTILS-$(CONFIG_CROND) += crond.o
|
||||||
MISCUTILS-$(CONFIG_CRONTAB) += crontab.o
|
MISCUTILS-$(CONFIG_CRONTAB) += crontab.o
|
||||||
|
MISCUTILS-$(CONFIG_BBCONFIG) += bbconfig.o
|
||||||
MISCUTILS-$(CONFIG_DC) += dc.o
|
MISCUTILS-$(CONFIG_DC) += dc.o
|
||||||
MISCUTILS-$(CONFIG_DEVFSD) += devfsd.o
|
MISCUTILS-$(CONFIG_DEVFSD) += devfsd.o
|
||||||
MISCUTILS-$(CONFIG_EJECT) += eject.o
|
MISCUTILS-$(CONFIG_EJECT) += eject.o
|
||||||
|
8
miscutils/bbconfig.c
Normal file
8
miscutils/bbconfig.c
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
#include "busybox.h"
|
||||||
|
#include "bbconfigopts.h"
|
||||||
|
|
||||||
|
int bbconfig_main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
printf(bbconfig_config);
|
||||||
|
return 0;
|
||||||
|
}
|
65
scripts/config/mkconfigs
Executable file
65
scripts/config/mkconfigs
Executable file
@ -0,0 +1,65 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Copyright (C) 2002 Khalid Aziz <khalid_aziz at hp.com>
|
||||||
|
# Copyright (C) 2002 Randy Dunlap <rddunlap at osdl.org>
|
||||||
|
# Copyright (C) 2002 Al Stone <ahs3 at fc.hp.com>
|
||||||
|
# Copyright (C) 2002 Hewlett-Packard Company
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
#
|
||||||
|
# Busybox version by Matteo Croce <3297627799 at wind.it>
|
||||||
|
#
|
||||||
|
# Rules to generate bbconfig.h from .config:
|
||||||
|
# - Retain lines that begin with "CONFIG_"
|
||||||
|
# - Retain lines that begin with "# CONFIG_"
|
||||||
|
# - lines that use double-quotes must \\-escape-quote them
|
||||||
|
|
||||||
|
if [ $# -lt 1 ]
|
||||||
|
then
|
||||||
|
config=.config
|
||||||
|
else config=$1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "#ifndef _BBCONFIG_H"
|
||||||
|
echo "#define _BBCONFIG_H"
|
||||||
|
echo \
|
||||||
|
"/*
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or (at
|
||||||
|
* your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
||||||
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
||||||
|
* details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* This file is generated automatically by scripts/config/mkconfigs. Do not edit.
|
||||||
|
*
|
||||||
|
*/"
|
||||||
|
|
||||||
|
echo "static char const bbconfig_config[] = "
|
||||||
|
echo "\"CONFIG_BEGIN=n\\n\\"
|
||||||
|
echo "`cat $config | sed 's/\"/\\\\\"/g' | grep "^#\? \?CONFIG_" | awk '{ print $0 "\\\\n\\\\" }' `"
|
||||||
|
echo "CONFIG_END=n\\n\";"
|
||||||
|
echo "#endif /* _BBCONFIG_H */"
|
Loading…
x
Reference in New Issue
Block a user