67d494339
Rob Landley
2006-06-22
Subject
CONFIG_DHCP -> CONFIG_APP_DHCP.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/applets.h+3 -3
| @@ -96,7 +96,7 @@ USE_DPKG(APPLET(dpkg, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | |
| USE_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, _BB_DIR_USR_BIN, _BB_SUID_NEVER, dpkg_deb)) | |
| USE_DU(APPLET(du, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | |
| USE_DUMPKMAP(APPLET(dumpkmap, _BB_DIR_BIN, _BB_SUID_NEVER)) | |
| - | USE_DUMPLEASES(APPLET(dumpleases, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
| + | USE_APP_DUMPLEASES(APPLET(dumpleases, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
| USE_E2FSCK(APPLET(e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER)) | |
| USE_E2LABEL(APPLET_NOUSAGE(e2label, tune2fs, _BB_DIR_SBIN, _BB_SUID_NEVER)) | |
| USE_ECHO(APPLET(echo, _BB_DIR_BIN, _BB_SUID_NEVER)) | |
| @@ -276,8 +276,8 @@ USE_TRACEROUTE(APPLET(traceroute, _BB_DIR_USR_BIN, _BB_SUID_MAYBE)) | |
| USE_TRUE(APPLET(true, _BB_DIR_BIN, _BB_SUID_NEVER)) | |
| USE_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | |
| USE_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_NEVER)) | |
| - | USE_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
| - | USE_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) |
| + | USE_APP_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
| + | USE_APP_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) |
| USE_UMOUNT(APPLET(umount, _BB_DIR_BIN, _BB_SUID_NEVER)) | |
| USE_UNAME(APPLET(uname, _BB_DIR_BIN, _BB_SUID_NEVER)) | |
| USE_UNCOMPRESS(APPLET(uncompress, _BB_DIR_BIN, _BB_SUID_NEVER)) | |
networking/udhcp/Config.in+6 -6
| @@ -5,7 +5,7 @@ | |
| menu "udhcp Server/Client" | |
| - | config CONFIG_UDHCPD |
| + | config CONFIG_APP_UDHCPD |
| bool "udhcp Server (udhcpd)" | |
| default n | |
| help | |
| @@ -14,7 +14,7 @@ config CONFIG_UDHCPD | |
| See http://udhcp.busybox.net for further details. | |
| - | config CONFIG_UDHCPC |
| + | config CONFIG_APP_UDHCPC |
| bool "udhcp Client (udhcpc)" | |
| default n | |
| help | |
| @@ -26,10 +26,10 @@ config CONFIG_UDHCPC | |
| See http://udhcp.busybox.net for further details. | |
| - | config CONFIG_DUMPLEASES |
| + | config CONFIG_APP_DUMPLEASES |
| bool "Lease display utility (dumpleases)" | |
| default n | |
| - | depends on CONFIG_UDHCPD |
| + | depends on CONFIG_APP_UDHCPD |
| help | |
| dumpleases displays the leases written out by the udhcpd server. | |
| Lease times are stored in the file by time remaining in lease, or | |
| @@ -40,7 +40,7 @@ config CONFIG_DUMPLEASES | |
| config CONFIG_FEATURE_UDHCP_SYSLOG | |
| bool " Log udhcp messages to syslog (instead of stdout)" | |
| default n | |
| - | depends on CONFIG_UDHCPD || CONFIG_UDHCPC |
| + | depends on CONFIG_APP_UDHCPD || CONFIG_APP_UDHCPC |
| help | |
| If selected, udhcpd will log all its messages to syslog, otherwise, | |
| it will attempt to log them to stdout. | |
| @@ -50,7 +50,7 @@ config CONFIG_FEATURE_UDHCP_SYSLOG | |
| config CONFIG_FEATURE_UDHCP_DEBUG | |
| bool " Compile udhcp with noisy debugging messages" | |
| default n | |
| - | depends on CONFIG_UDHCPD || CONFIG_UDHCPC |
| + | depends on CONFIG_APP_UDHCPD || CONFIG_APP_UDHCPC |
| help | |
| If selected, udhcpd will output extra debugging output. If using | |
| this option, compile uDHCP with "-g", and do not fork the daemon to | |
networking/udhcp/Makefile.in+5 -5
| @@ -12,10 +12,10 @@ endif | |
| srcdir=$(top_srcdir)/networking/udhcp | |
| #ok, so I forgot how to do an or, but this is a quick and dirty hack | |
| - | ifeq ($(strip $(CONFIG_UDHCPC)),y) |
| + | ifeq ($(strip $(CONFIG_APP_UDHCPC)),y) |
| CONFIG_UDHCP_SHARED=y | |
| else | |
| - | ifeq ($(strip $(CONFIG_UDHCPD)),y) |
| + | ifeq ($(strip $(CONFIG_APP_UDHCPD)),y) |
| CONFIG_UDHCP_SHARED=y | |
| else | |
| CONFIG_UDHCP_SHARED=n | |
| @@ -25,11 +25,11 @@ endif | |
| UDHCP-y:= | |
| UDHCP-$(CONFIG_UDHCP_SHARED) += common.c options.c packet.c pidfile.c \ | |
| signalpipe.c socket.c | |
| - | UDHCP-$(CONFIG_UDHCPC) += dhcpc.c clientpacket.c clientsocket.c \ |
| + | UDHCP-$(CONFIG_APP_UDHCPC) += dhcpc.c clientpacket.c clientsocket.c \ |
| script.c | |
| - | UDHCP-$(CONFIG_UDHCPD) += dhcpd.c arpping.c files.c leases.c \ |
| + | UDHCP-$(CONFIG_APP_UDHCPD) += dhcpd.c arpping.c files.c leases.c \ |
| serverpacket.c static_leases.c | |
| - | UDHCP-$(CONFIG_DUMPLEASES) += dumpleases.c |
| + | UDHCP-$(CONFIG_APP_DUMPLEASES) += dumpleases.c |
| UDHCP_OBJS:=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y)) | |
| ifneq ($(strip $(UDHCP-y)),) | |