From c8aae0b2a0406b499ec8dea4a1e29b52be9da0d0 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 6 Jun 2010 22:14:58 +0200 Subject: fix allnoconfig Signed-off-by: Denys Vlasenko --- shell/Config.src | 107 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 52 deletions(-) (limited to 'shell') diff --git a/shell/Config.src b/shell/Config.src index 234d05367..12f655375 100644 --- a/shell/Config.src +++ b/shell/Config.src @@ -5,58 +5,6 @@ menu "Shells" -choice - prompt "Choose which shell is aliased to 'sh' name" - default FEATURE_SH_IS_ASH - help - Choose which shell you want to be executed by 'sh' alias. - The ash shell is the most bash compatible and full featured one. - -config FEATURE_SH_IS_ASH - select ASH - bool "ash" - depends on !NOMMU - -config FEATURE_SH_IS_HUSH - select HUSH - bool "hush" - -config FEATURE_SH_IS_NONE - bool "none" - -endchoice - -choice - prompt "Choose which shell is aliased to 'bash' name" - default FEATURE_BASH_IS_NONE - help - Choose which shell you want to be executed by 'bash' alias. - The ash shell is the most bash compatible and full featured one. - - Note that selecting this option does not switch on any bash - compatibility code. It merely makes it possible to install - /bin/bash (sym)link and run scripts which start with - #!/bin/bash line. - - Many systems use it in scripts which use bash-specific features, - even simple ones like $RANDOM. Without this option, busybox - can't be used for running them because it won't recongnize - "bash" as a supported applet name. - -config FEATURE_BASH_IS_ASH - select ASH - bool "ash" - depends on !NOMMU - -config FEATURE_BASH_IS_HUSH - select HUSH - bool "hush" - -config FEATURE_BASH_IS_NONE - bool "none" - -endchoice - config ASH bool "ash" default y @@ -266,6 +214,61 @@ config HUSH_RANDOM_SUPPORT Enable pseudorandom generator and dynamic variable "$RANDOM". Each read of "$RANDOM" will generate a new pseudorandom value. + +choice + prompt "Choose which shell is aliased to 'sh' name" + default FEATURE_SH_IS_ASH + help + Choose which shell you want to be executed by 'sh' alias. + The ash shell is the most bash compatible and full featured one. + +# note: cannot use "select ASH" here, it breaks "amke allnoconfig" +config FEATURE_SH_IS_ASH + depends on ASH + bool "ash" + depends on !NOMMU + +config FEATURE_SH_IS_HUSH + depends on HUSH + bool "hush" + +config FEATURE_SH_IS_NONE + bool "none" + +endchoice + +choice + prompt "Choose which shell is aliased to 'bash' name" + default FEATURE_BASH_IS_NONE + help + Choose which shell you want to be executed by 'bash' alias. + The ash shell is the most bash compatible and full featured one. + + Note that selecting this option does not switch on any bash + compatibility code. It merely makes it possible to install + /bin/bash (sym)link and run scripts which start with + #!/bin/bash line. + + Many systems use it in scripts which use bash-specific features, + even simple ones like $RANDOM. Without this option, busybox + can't be used for running them because it won't recongnize + "bash" as a supported applet name. + +config FEATURE_BASH_IS_ASH + depends on ASH + bool "ash" + depends on !NOMMU + +config FEATURE_BASH_IS_HUSH + depends on HUSH + bool "hush" + +config FEATURE_BASH_IS_NONE + bool "none" + +endchoice + + config LASH bool "lash (deprecated: aliased to hush)" default n -- cgit v1.2.3-55-g6feb From 121fb9506bcade96b6fb8b1dbcbbb7699bfb1a9d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 7 Jun 2010 13:34:34 +0200 Subject: typo fix Signed-off-by: Denys Vlasenko --- shell/Config.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/Config.src b/shell/Config.src index 12f655375..966fa7012 100644 --- a/shell/Config.src +++ b/shell/Config.src @@ -222,7 +222,7 @@ choice Choose which shell you want to be executed by 'sh' alias. The ash shell is the most bash compatible and full featured one. -# note: cannot use "select ASH" here, it breaks "amke allnoconfig" +# note: cannot use "select ASH" here, it breaks "make allnoconfig" config FEATURE_SH_IS_ASH depends on ASH bool "ash" -- cgit v1.2.3-55-g6feb From 729ecb87bfbbaf9250837d8b8748503c5e97bfd6 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 7 Jun 2010 14:14:26 +0200 Subject: bbconfig: make it independent from printf functions function old new delta full_write2_str - 25 +25 full_write1_str - 25 +25 clear_main 21 20 -1 telnet_main 1488 1477 -11 getty_main 1932 1918 -14 full_write22_str 25 - -25 ------------------------------------------------------------------------------ (add/remove: 2/1 grow/shrink: 0/3 up/down: 50/-51) Total: -1 bytes Signed-off-by: Denys Vlasenko --- TEST_config_noprintf | 16 ++++++++-------- console-tools/clear.c | 6 +----- coreutils/basename.c | 12 +++++------- include/libbb.h | 2 ++ libbb/appletlib.c | 7 ------- libbb/xfuncs.c | 10 ++++++++++ loginutils/getty.c | 3 +-- miscutils/bbconfig.c | 2 +- networking/telnet.c | 4 ++-- scripts/mkconfigs | 3 +-- shell/hush.c | 2 +- 11 files changed, 32 insertions(+), 35 deletions(-) (limited to 'shell') diff --git a/TEST_config_noprintf b/TEST_config_noprintf index f787e7a14..ba003a1fb 100644 --- a/TEST_config_noprintf +++ b/TEST_config_noprintf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.17.0.git -# Sun Jun 6 21:38:58 2010 +# Mon Jun 7 13:37:55 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -579,7 +579,7 @@ CONFIG_VOLUMEID=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set +CONFIG_BBCONFIG=y # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 @@ -872,12 +872,6 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # # Shells # -# CONFIG_FEATURE_SH_IS_ASH is not set -# CONFIG_FEATURE_SH_IS_HUSH is not set -CONFIG_FEATURE_SH_IS_NONE=y -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y # CONFIG_ASH is not set # CONFIG_ASH_BASH_COMPAT is not set # CONFIG_ASH_JOB_CONTROL is not set @@ -904,6 +898,12 @@ CONFIG_FEATURE_BASH_IS_NONE=y # CONFIG_HUSH_LOCAL is not set # CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_FEATURE_SH_IS_ASH is not set +# CONFIG_FEATURE_SH_IS_HUSH is not set +CONFIG_FEATURE_SH_IS_NONE=y +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y # CONFIG_LASH is not set # CONFIG_MSH is not set # CONFIG_SH_MATH_SUPPORT is not set diff --git a/console-tools/clear.c b/console-tools/clear.c index b0c6d65d2..cac716394 100644 --- a/console-tools/clear.c +++ b/console-tools/clear.c @@ -5,16 +5,12 @@ * Copyright (C) 1999-2004 by Erik Andersen * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - * */ - -/* no options, no getopt */ - #include "libbb.h" int clear_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int clear_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) { /* home; clear to the end of screen */ - return printf("\033[H""\033[J") != 6; + return full_write1_str("\033[H""\033[J") != 6; } diff --git a/coreutils/basename.c b/coreutils/basename.c index d1ad91ba1..b79d561c2 100644 --- a/coreutils/basename.c +++ b/coreutils/basename.c @@ -5,13 +5,8 @@ * Copyright (C) 1999-2004 by Erik Andersen * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - * */ -/* BB_AUDIT SUSv3 compliant */ -/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */ - - /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) * * Changes: @@ -20,6 +15,9 @@ * 3) Save some space by using strcmp(). Calling strncmp() here was silly. */ +/* BB_AUDIT SUSv3 compliant */ +/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */ + //kbuild:lib-$(CONFIG_BASENAME) += basename.o //config:config BASENAME @@ -40,7 +38,7 @@ int basename_main(int argc, char **argv) size_t m, n; char *s; - if (((unsigned int)(argc-2)) >= 2) { + if ((unsigned)(argc-2) >= 2) { bb_show_usage(); } @@ -50,7 +48,7 @@ int basename_main(int argc, char **argv) m = strlen(s); if (*++argv) { n = strlen(*argv); - if ((m > n) && ((strcmp)(s+m-n, *argv) == 0)) { + if ((m > n) && (strcmp(s+m-n, *argv) == 0)) { m -= n; /*s[m] = '\0'; - redundant */ } diff --git a/include/libbb.h b/include/libbb.h index 3fffa83ed..22c72d9ee 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -674,6 +674,8 @@ extern ssize_t safe_write(int fd, const void *buf, size_t count) FAST_FUNC; extern ssize_t full_write(int fd, const void *buf, size_t count) FAST_FUNC; extern void xwrite(int fd, const void *buf, size_t count) FAST_FUNC; extern void xwrite_str(int fd, const char *str) FAST_FUNC; +extern ssize_t full_write1_str(const char *str) FAST_FUNC; +extern ssize_t full_write2_str(const char *str) FAST_FUNC; extern void xopen_xwrite_close(const char* file, const char *str) FAST_FUNC; /* Close fd, but check for failures (some types of write errors) */ diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 6267f2673..f3d530184 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c @@ -98,13 +98,6 @@ static const char *unpack_usage_messages(void) #endif /* FEATURE_COMPRESS_USAGE */ -static void full_write2_str(const char *str) -{ - // This uses stdio: - //xwrite_str(STDERR_FILENO, str); - write(STDERR_FILENO, str, strlen(str)); -} - void FAST_FUNC bb_show_usage(void) { if (ENABLE_SHOW_USAGE) { diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 6200fc600..1cd8d7c01 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -204,6 +204,16 @@ int FAST_FUNC bb_putchar_stderr(char ch) return write(STDERR_FILENO, &ch, 1); } +ssize_t FAST_FUNC full_write1_str(const char *str) +{ + return full_write(STDOUT_FILENO, str, strlen(str)); +} + +ssize_t FAST_FUNC full_write2_str(const char *str) +{ + return full_write(STDERR_FILENO, str, strlen(str)); +} + static int wh_helper(int value, int def_val, const char *env_name, int *err) { if (value == 0) { diff --git a/loginutils/getty.c b/loginutils/getty.c index 7fb861f9d..a5e8e906a 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c @@ -673,8 +673,7 @@ int getty_main(int argc UNUSED_PARAM, char **argv) /* Write the modem init string and DON'T flush the buffers */ if (options.flags & F_INITSTRING) { debug("writing init string\n"); - /* todo: use xwrite_str? */ - full_write(STDOUT_FILENO, options.initstring, strlen(options.initstring)); + full_write1_str(options.initstring); } /* Optionally detect the baud rate from the modem status message */ diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c index 689052e86..0d649b4e5 100644 --- a/miscutils/bbconfig.c +++ b/miscutils/bbconfig.c @@ -7,6 +7,6 @@ int bbconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int bbconfig_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) { - printf(bbconfig_config); + full_write1_str(bbconfig_config); return 0; } diff --git a/networking/telnet.c b/networking/telnet.c index ec3db0c5e..57997f6b9 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -418,7 +418,7 @@ static void to_echo(void) put_iac2(DONT, TELOPT_ECHO); setConMode(); - write_str(1, "\r\n"); /* sudden modec */ + full_write1_str("\r\n"); /* sudden modec */ } static void to_sga(void) @@ -637,7 +637,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) { len = safe_read(netfd, G.buf, DATABUFSIZE); if (len <= 0) { - write_str(1, "Connection closed by foreign host\r\n"); + full_write1_str("Connection closed by foreign host\r\n"); doexit(EXIT_FAILURE); } TRACE(0, ("Read netfd (%d): %d\n", netfd, len)); diff --git a/scripts/mkconfigs b/scripts/mkconfigs index 0d1771a36..ef6ae8aaf 100755 --- a/scripts/mkconfigs +++ b/scripts/mkconfigs @@ -42,9 +42,8 @@ echo "\ * * This file is generated automatically by scripts/mkconfigs. * Do not edit. - * */ -static const char *const bbconfig_config =" +static const char bbconfig_config[] =" sed 's/\"/\\\"/g' $config | grep "^#\? \?CONFIG_" | awk '{print "\"" $0 "\\n\"";}' diff --git a/shell/hush.c b/shell/hush.c index 4cccf31a4..4832e2c48 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -7103,7 +7103,7 @@ int hush_main(int argc, char **argv) break; #if !BB_MMU case '<': /* "big heredoc" support */ - full_write(STDOUT_FILENO, optarg, strlen(optarg)); + full_write1_str(optarg); _exit(0); case '$': { unsigned long long empty_trap_mask; -- cgit v1.2.3-55-g6feb From d70e0e995e41dc422442acd1eb4b086ff81b1961 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 8 Jun 2010 12:15:11 +0200 Subject: *: add INSERTs to *.src files where appropriate Signed-off-by: Denys Vlasenko --- archival/Config.src | 2 ++ archival/Kbuild.src | 3 +++ archival/libunarchive/Kbuild.src | 2 ++ console-tools/Config.src | 2 ++ console-tools/Kbuild.src | 2 ++ coreutils/Kbuild.src | 1 + coreutils/libcoreutils/Kbuild.src | 2 ++ debianutils/Config.src | 2 ++ debianutils/Kbuild.src | 2 ++ e2fsprogs/Config.src | 2 ++ e2fsprogs/Kbuild.src | 2 ++ e2fsprogs/old_e2fsprogs/Config.src | 2 ++ e2fsprogs/old_e2fsprogs/Kbuild.src | 2 ++ e2fsprogs/old_e2fsprogs/blkid/Kbuild.src | 3 +++ e2fsprogs/old_e2fsprogs/e2p/Kbuild.src | 3 +++ e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src | 3 +++ e2fsprogs/old_e2fsprogs/uuid/Kbuild.src | 2 ++ editors/Config.src | 2 ++ editors/Kbuild.src | 2 ++ init/Config.src | 2 ++ init/Kbuild.src | 2 ++ libbb/Config.src | 2 ++ libbb/Kbuild.src | 2 ++ loginutils/Config.src | 2 ++ loginutils/Kbuild.src | 2 ++ mailutils/Config.src | 2 ++ mailutils/Kbuild.src | 2 ++ miscutils/Config.src | 2 ++ miscutils/Kbuild.src | 2 ++ modutils/Kbuild.src | 1 + networking/Config.src | 2 ++ networking/Kbuild.src | 2 ++ networking/libiproute/Kbuild.src | 2 ++ networking/udhcp/Config.src | 2 ++ networking/udhcp/Kbuild.src | 2 ++ printutils/Config.src | 2 ++ procps/Config.src | 2 ++ procps/Kbuild.src | 2 ++ runit/Config.src | 2 ++ runit/Kbuild.src | 3 +++ selinux/Config.src | 2 ++ selinux/Kbuild.src | 2 ++ shell/Config.src | 2 ++ shell/Kbuild.src | 3 +++ sysklogd/Config.src | 2 ++ sysklogd/Kbuild.src | 2 ++ util-linux/Config.src | 2 ++ util-linux/Kbuild.src | 2 ++ util-linux/volume_id/Kbuild.src | 2 ++ 49 files changed, 102 insertions(+) (limited to 'shell') diff --git a/archival/Config.src b/archival/Config.src index de453bc21..3dbd3aea1 100644 --- a/archival/Config.src +++ b/archival/Config.src @@ -5,6 +5,8 @@ menu "Archival Utilities" +INSERT + config FEATURE_SEAMLESS_XZ bool "Make tar, rpm, modprobe etc understand .xz data" default y diff --git a/archival/Kbuild.src b/archival/Kbuild.src index 3300ea90f..076e58278 100644 --- a/archival/Kbuild.src +++ b/archival/Kbuild.src @@ -7,6 +7,9 @@ libs-y += libunarchive/ lib-y:= + +INSERT + lib-$(CONFIG_AR) += ar.o lib-$(CONFIG_CPIO) += cpio.o lib-$(CONFIG_DPKG) += dpkg.o diff --git a/archival/libunarchive/Kbuild.src b/archival/libunarchive/Kbuild.src index ed8e85793..81854558b 100644 --- a/archival/libunarchive/Kbuild.src +++ b/archival/libunarchive/Kbuild.src @@ -33,6 +33,8 @@ DPKG_FILES:= \ get_header_tar.o \ filter_accept_list_reassign.o +INSERT + lib-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o lib-$(CONFIG_BUNZIP2) += decompress_bunzip2.o lib-$(CONFIG_UNLZMA) += decompress_unlzma.o diff --git a/console-tools/Config.src b/console-tools/Config.src index 1a8e2e128..6e3191ada 100644 --- a/console-tools/Config.src +++ b/console-tools/Config.src @@ -5,6 +5,8 @@ menu "Console Utilities" +INSERT + config CHVT bool "chvt" default y diff --git a/console-tools/Kbuild.src b/console-tools/Kbuild.src index ad8b8ce77..17f660638 100644 --- a/console-tools/Kbuild.src +++ b/console-tools/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_CHVT) += chvt.o lib-$(CONFIG_FGCONSOLE) += fgconsole.o lib-$(CONFIG_CLEAR) += clear.o diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src index 57ea7d6c4..1c846a75f 100644 --- a/coreutils/Kbuild.src +++ b/coreutils/Kbuild.src @@ -7,6 +7,7 @@ libs-y += libcoreutils/ lib-y:= + INSERT lib-$(CONFIG_CAL) += cal.o lib-$(CONFIG_CATV) += catv.o diff --git a/coreutils/libcoreutils/Kbuild.src b/coreutils/libcoreutils/Kbuild.src index 755d01f86..981b60628 100644 --- a/coreutils/libcoreutils/Kbuild.src +++ b/coreutils/libcoreutils/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2 or later, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_MKFIFO) += getopt_mk_fifo_nod.o lib-$(CONFIG_MKNOD) += getopt_mk_fifo_nod.o lib-$(CONFIG_INSTALL) += cp_mv_stat.o diff --git a/debianutils/Config.src b/debianutils/Config.src index 9bce0498c..838d8f00c 100644 --- a/debianutils/Config.src +++ b/debianutils/Config.src @@ -5,6 +5,8 @@ menu "Debian Utilities" +INSERT + config MKTEMP bool "mktemp" default y diff --git a/debianutils/Kbuild.src b/debianutils/Kbuild.src index bcf6126ad..da34e4e4f 100644 --- a/debianutils/Kbuild.src +++ b/debianutils/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_MKTEMP) += mktemp.o lib-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o lib-$(CONFIG_RUN_PARTS) += run_parts.o diff --git a/e2fsprogs/Config.src b/e2fsprogs/Config.src index e331ee5ef..f362c6b0a 100644 --- a/e2fsprogs/Config.src +++ b/e2fsprogs/Config.src @@ -5,6 +5,8 @@ menu "Linux Ext2 FS Progs" +INSERT + config CHATTR bool "chattr" default y diff --git a/e2fsprogs/Kbuild.src b/e2fsprogs/Kbuild.src index 0fdc9d215..31c271238 100644 --- a/e2fsprogs/Kbuild.src +++ b/e2fsprogs/Kbuild.src @@ -6,6 +6,8 @@ lib-y:= +INSERT + lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o diff --git a/e2fsprogs/old_e2fsprogs/Config.src b/e2fsprogs/old_e2fsprogs/Config.src index 5990f556c..bbec08e7e 100644 --- a/e2fsprogs/old_e2fsprogs/Config.src +++ b/e2fsprogs/old_e2fsprogs/Config.src @@ -5,6 +5,8 @@ menu "Linux Ext2 FS Progs" +INSERT + config CHATTR bool "chattr" default n diff --git a/e2fsprogs/old_e2fsprogs/Kbuild.src b/e2fsprogs/old_e2fsprogs/Kbuild.src index b05bb92e1..07a09ca3d 100644 --- a/e2fsprogs/old_e2fsprogs/Kbuild.src +++ b/e2fsprogs/old_e2fsprogs/Kbuild.src @@ -6,6 +6,8 @@ lib-y:= +INSERT + lib-$(CONFIG_CHATTR) += chattr.o lib-$(CONFIG_E2FSCK) += e2fsck.o util.o lib-$(CONFIG_FSCK) += fsck.o util.o diff --git a/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src b/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src index ddcfdfd9a..bae77fe63 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src +++ b/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src @@ -10,6 +10,9 @@ NEEDED-$(CONFIG_MKE2FS) = y NEEDED-$(CONFIG_TUNE2FS) = y lib-y:= + +INSERT + lib-$(NEEDED-y) += cache.o dev.o devname.o devno.o blkid_getsize.o \ probe.o read.o resolve.o save.o tag.o list.o diff --git a/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src b/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src index c0ff824e3..194870788 100644 --- a/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src +++ b/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src @@ -10,6 +10,9 @@ NEEDED-$(CONFIG_MKE2FS) = y NEEDED-$(CONFIG_TUNE2FS) = y lib-y:= + +INSERT + lib-$(NEEDED-y) += fgetsetflags.o fgetsetversion.o pf.o iod.o mntopts.o \ feature.o ls.o uuid.o pe.o ostype.o ps.o hashstr.o \ parse_num.o diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src b/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src index 185887a44..8ca65ee90 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src +++ b/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src @@ -10,6 +10,9 @@ NEEDED-$(CONFIG_MKE2FS) = y NEEDED-$(CONFIG_TUNE2FS) = y lib-y:= + +INSERT + lib-$(NEEDED-y) += gen_bitmap.o bitops.o ismounted.o mkjournal.o unix_io.o \ rw_bitmaps.o initialize.o bitmaps.o block.o \ ind_block.o inode.o freefs.o alloc_stats.o closefs.o \ diff --git a/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src b/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src index dde981840..9454faba7 100644 --- a/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src +++ b/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src @@ -10,5 +10,7 @@ NEEDED-$(CONFIG_MKE2FS) = y NEEDED-$(CONFIG_TUNE2FS) = y lib-y:= + +INSERT lib-$(NEEDED-y) += compare.o gen_uuid.o pack.o parse.o unpack.o unparse.o \ uuid_time.o diff --git a/editors/Config.src b/editors/Config.src index 6cf21919c..fc824ccd5 100644 --- a/editors/Config.src +++ b/editors/Config.src @@ -5,6 +5,8 @@ menu "Editors" +INSERT + config AWK bool "awk" default y diff --git a/editors/Kbuild.src b/editors/Kbuild.src index 76302aa76..9d4b9d053 100644 --- a/editors/Kbuild.src +++ b/editors/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_AWK) += awk.o lib-$(CONFIG_CMP) += cmp.o lib-$(CONFIG_DIFF) += diff.o diff --git a/init/Config.src b/init/Config.src index e8121c96a..2e9208150 100644 --- a/init/Config.src +++ b/init/Config.src @@ -5,6 +5,8 @@ menu "Init Utilities" +INSERT + config INIT bool "init" default y diff --git a/init/Kbuild.src b/init/Kbuild.src index ce3f30256..6095a78bb 100644 --- a/init/Kbuild.src +++ b/init/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_HALT) += halt.o lib-$(CONFIG_INIT) += init.o lib-$(CONFIG_MESG) += mesg.o diff --git a/libbb/Config.src b/libbb/Config.src index a0aeb3683..80b1e0d21 100644 --- a/libbb/Config.src +++ b/libbb/Config.src @@ -5,6 +5,8 @@ menu "Busybox Library Tuning" +INSERT + config PASSWORD_MINLEN int "Minimum password length" default 6 diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index 68d04b3bd..29c136ccb 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src @@ -6,6 +6,8 @@ lib-y:= +INSERT + lib-y += appletlib.o lib-y += ask_confirmation.o lib-y += bb_askpass.o diff --git a/loginutils/Config.src b/loginutils/Config.src index 982d5d669..5d497c4dc 100644 --- a/loginutils/Config.src +++ b/loginutils/Config.src @@ -5,6 +5,8 @@ menu "Login/Password Management Utilities" +INSERT + config FEATURE_SHADOWPASSWDS bool "Support for shadow passwords" default y diff --git a/loginutils/Kbuild.src b/loginutils/Kbuild.src index 3d0d777e8..fd1ea06c1 100644 --- a/loginutils/Kbuild.src +++ b/loginutils/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_ADDGROUP) += addgroup.o lib-$(CONFIG_ADDUSER) += adduser.o lib-$(CONFIG_CRYPTPW) += cryptpw.o diff --git a/mailutils/Config.src b/mailutils/Config.src index baa04331a..2a9c5c074 100644 --- a/mailutils/Config.src +++ b/mailutils/Config.src @@ -1,5 +1,7 @@ menu "Mail Utilities" +INSERT + config MAKEMIME bool "makemime" default y diff --git a/mailutils/Kbuild.src b/mailutils/Kbuild.src index 871e87981..b2fb73515 100644 --- a/mailutils/Kbuild.src +++ b/mailutils/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_MAKEMIME) += mime.o mail.o lib-$(CONFIG_POPMAILDIR) += popmaildir.o mail.o lib-$(CONFIG_REFORMIME) += mime.o mail.o diff --git a/miscutils/Config.src b/miscutils/Config.src index a822f2a19..be2b37666 100644 --- a/miscutils/Config.src +++ b/miscutils/Config.src @@ -5,6 +5,8 @@ menu "Miscellaneous Utilities" +INSERT + config ADJTIMEX bool "adjtimex" default y diff --git a/miscutils/Kbuild.src b/miscutils/Kbuild.src index 3c8ce42ba..d9bf14312 100644 --- a/miscutils/Kbuild.src +++ b/miscutils/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_ADJTIMEX) += adjtimex.o lib-$(CONFIG_BBCONFIG) += bbconfig.o lib-$(CONFIG_BEEP) += beep.o diff --git a/modutils/Kbuild.src b/modutils/Kbuild.src index fc0808d7f..a512f6066 100644 --- a/modutils/Kbuild.src +++ b/modutils/Kbuild.src @@ -5,6 +5,7 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + INSERT lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o lib-$(CONFIG_DEPMOD) += depmod.o modutils.o diff --git a/networking/Config.src b/networking/Config.src index eb8dc1ce2..51dcb7717 100644 --- a/networking/Config.src +++ b/networking/Config.src @@ -5,6 +5,8 @@ menu "Networking Utilities" +INSERT + config FEATURE_IPV6 bool "Enable IPv6 support" default y diff --git a/networking/Kbuild.src b/networking/Kbuild.src index b0765bcf6..e1a4ebcb3 100644 --- a/networking/Kbuild.src +++ b/networking/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_ARP) += arp.o interface.o lib-$(CONFIG_ARPING) += arping.o lib-$(CONFIG_BRCTL) += brctl.o diff --git a/networking/libiproute/Kbuild.src b/networking/libiproute/Kbuild.src index 5f9dd32b6..b0aa50a97 100644 --- a/networking/libiproute/Kbuild.src +++ b/networking/libiproute/Kbuild.src @@ -7,6 +7,8 @@ lib-y:= +INSERT + lib-$(CONFIG_SLATTACH) += \ utils.o diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src index f5840a945..aac88569b 100644 --- a/networking/udhcp/Config.src +++ b/networking/udhcp/Config.src @@ -3,6 +3,8 @@ # see scripts/kbuild/config-language.txt. # +INSERT + config UDHCPD bool "udhcp server (udhcpd)" default y diff --git a/networking/udhcp/Kbuild.src b/networking/udhcp/Kbuild.src index 1803903f0..f845bc1d9 100644 --- a/networking/udhcp/Kbuild.src +++ b/networking/udhcp/Kbuild.src @@ -7,6 +7,8 @@ lib-y:= +INSERT + lib-$(CONFIG_UDHCPC) += common.o packet.o signalpipe.o socket.o lib-$(CONFIG_UDHCPD) += common.o packet.o signalpipe.o socket.o diff --git a/printutils/Config.src b/printutils/Config.src index 194789660..cc4ab8d28 100644 --- a/printutils/Config.src +++ b/printutils/Config.src @@ -5,6 +5,8 @@ menu "Print Utilities" +INSERT + config LPD bool "lpd" default y diff --git a/procps/Config.src b/procps/Config.src index 01f6b0cf9..e61de5614 100644 --- a/procps/Config.src +++ b/procps/Config.src @@ -5,6 +5,8 @@ menu "Process Utilities" +INSERT + config FREE bool "free" default y diff --git a/procps/Kbuild.src b/procps/Kbuild.src index 8e62fdfa6..c41f12b15 100644 --- a/procps/Kbuild.src +++ b/procps/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_FREE) += free.o lib-$(CONFIG_FUSER) += fuser.o lib-$(CONFIG_KILL) += kill.o diff --git a/runit/Config.src b/runit/Config.src index 53b445101..9db974002 100644 --- a/runit/Config.src +++ b/runit/Config.src @@ -5,6 +5,8 @@ menu "Runit Utilities" +INSERT + config RUNSV bool "runsv" default y diff --git a/runit/Kbuild.src b/runit/Kbuild.src index ab9eef6ff..4d85372df 100644 --- a/runit/Kbuild.src +++ b/runit/Kbuild.src @@ -5,6 +5,9 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT + lib-$(CONFIG_RUNSV) += runsv.o runit_lib.o lib-$(CONFIG_RUNSVDIR) += runsvdir.o runit_lib.o lib-$(CONFIG_SV) += sv.o runit_lib.o diff --git a/selinux/Config.src b/selinux/Config.src index e46030adf..64a99203e 100644 --- a/selinux/Config.src +++ b/selinux/Config.src @@ -6,6 +6,8 @@ menu "SELinux Utilities" depends on SELINUX +INSERT + config CHCON bool "chcon" default n diff --git a/selinux/Kbuild.src b/selinux/Kbuild.src index d0c190ceb..6567e3c07 100644 --- a/selinux/Kbuild.src +++ b/selinux/Kbuild.src @@ -6,6 +6,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_CHCON) += chcon.o lib-$(CONFIG_GETENFORCE) += getenforce.o lib-$(CONFIG_GETSEBOOL) += getsebool.o diff --git a/shell/Config.src b/shell/Config.src index 966fa7012..800911966 100644 --- a/shell/Config.src +++ b/shell/Config.src @@ -5,6 +5,8 @@ menu "Shells" +INSERT + config ASH bool "ash" default y diff --git a/shell/Kbuild.src b/shell/Kbuild.src index 8bdb68b11..d76b35386 100644 --- a/shell/Kbuild.src +++ b/shell/Kbuild.src @@ -5,6 +5,9 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT + lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o lib-$(CONFIG_HUSH) += hush.o match.o shell_common.o lib-$(CONFIG_CTTYHACK) += cttyhack.o diff --git a/sysklogd/Config.src b/sysklogd/Config.src index af00d65bb..6d574abb1 100644 --- a/sysklogd/Config.src +++ b/sysklogd/Config.src @@ -5,6 +5,8 @@ menu "System Logging Utilities" +INSERT + config SYSLOGD bool "syslogd" default y diff --git a/sysklogd/Kbuild.src b/sysklogd/Kbuild.src index d802198e6..faaac110c 100644 --- a/sysklogd/Kbuild.src +++ b/sysklogd/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_KLOGD) += klogd.o lib-$(CONFIG_LOGGER) += syslogd_and_logger.o lib-$(CONFIG_LOGREAD) += logread.o diff --git a/util-linux/Config.src b/util-linux/Config.src index 997cdec83..e97125917 100644 --- a/util-linux/Config.src +++ b/util-linux/Config.src @@ -5,6 +5,8 @@ menu "Linux System Utilities" +INSERT + config ACPID bool "acpid" default y diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src index 4fa392398..afc0db50e 100644 --- a/util-linux/Kbuild.src +++ b/util-linux/Kbuild.src @@ -5,6 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= + +INSERT lib-$(CONFIG_ACPID) += acpid.o lib-$(CONFIG_BLKID) += blkid.o lib-$(CONFIG_DMESG) += dmesg.o diff --git a/util-linux/volume_id/Kbuild.src b/util-linux/volume_id/Kbuild.src index 3520f2480..8af3ccd81 100644 --- a/util-linux/volume_id/Kbuild.src +++ b/util-linux/volume_id/Kbuild.src @@ -6,6 +6,8 @@ lib-y:= +INSERT + lib-$(CONFIG_BLKID) += get_devname.o lib-$(CONFIG_FINDFS) += get_devname.o lib-$(CONFIG_FEATURE_MOUNT_LABEL) += get_devname.o -- cgit v1.2.3-55-g6feb