[BusyBox] [PATCH] Non-CONFIG options
Robert Schwebel
robert at schwebel.de
Fri Dec 13 12:14:03 UTC 2002
On Fri, Dec 13, 2002 at 06:50:42PM +0100, Robert Schwebel wrote:
[...]
Here's a patch against current CVS which changes the variables. I'm not
sure about the debian files and DODEBUG; somebody should have a look at
this.
I also noticed that DOSTATIC appeared twice...
Robert
--
Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Braunschweiger Str. 79, 31134 Hildesheim, Germany
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Phone: +49-5121-28619-0 | Fax: +49-5121-28619-4
-------------- next part --------------
diff -u -b -B -w -p -u -r1.278 Changelog
--- Changelog 5 Aug 2002 02:57:09 -0000 1.278
+++ Changelog 13 Dec 2002 19:07:06 -0000
@@ -14,6 +14,8 @@
Other Changes:
+ * Robert Schwebel
+ -- all config variables start with CONFIG_ now
* Vladimir Oleynik, Manuel Novoa III, Aaron Lehmann
-- a whole bunch of ash size optimizations
-- Fix for ash leading redirections (i.e. '2>/dev/null ls rubbish')
diff -u -b -B -w -p -u -r1.10 Rules.mak
--- Rules.mak 5 Dec 2002 18:28:41 -0000 1.10
+++ Rules.mak 13 Dec 2002 19:07:06 -0000
@@ -34,7 +34,7 @@ BUILDTIME := $(shell TZ=UTC date -u "+%Y
# to something more interesting... Target architecture is determined
# by asking the CC compiler what arch it compiles things for, so unless
# your compiler is broken, you should not need to specify TARGET_ARCH
-CROSS =$(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
+CROSS =$(subst ",, $(strip $(CONFIG_CROSS_COMPILER_PREFIX)))
CC = $(CROSS)gcc
AR := $(CROSS)ar
AS := $(CROSS)as
@@ -55,7 +55,7 @@ HOSTCFLAGS:= -Wall -Wstrict-prototypes -
# If you want to add some simple compiler switches (like -march=i686),
# especially from the command line, use this instead of CFLAGS directly.
# For optimization overrides, it's better still to set OPTIMIZATION.
-CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS)))
+CFLAGS_EXTRA=$(subst ",, $(strip $(CONFIG_EXTRA_CFLAGS_OPTIONS)))
# If you have a "pristine" source directory, point BB_SRC_DIR to it.
# Experimental and incomplete; tell the mailing list
@@ -141,20 +141,20 @@ OPTIMIZATIONS:=$(OPTIMIZATION) -fomit-fr
# prone to casual user adjustment.
#
-ifeq ($(strip $(DOLFS)),y)
+ifeq ($(strip $(CONFIG_DOLFS)),y)
# For large file summit support
CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
endif
-ifeq ($(strip $(DODMALLOC)),y)
+ifeq ($(strip $(CONFIG_DODMALLOC)),y)
# For testing mem leaks with dmalloc
CFLAGS+=-DDMALLOC
LIBRARIES:=-ldmalloc
else
- ifeq ($(strip $(DOEFENCE)),y)
+ ifeq ($(strip $(CONFIG_DOEFENCE)),y)
LIBRARIES:=-lefence
endif
endif
-ifeq ($(strip $(DODEBUG)),y)
+ifeq ($(strip $(CONFIG_DODEBUG)),y)
CFLAGS +=$(WARNINGS) -g -D_GNU_SOURCE
LDFLAGS +=-Wl,-warn-common
STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging
@@ -163,7 +163,7 @@ else
LDFLAGS += -s -Wl,-warn-common
STRIPCMD:=$(STRIP) --remove-section=.note --remove-section=.comment
endif
-ifeq ($(strip $(DOSTATIC)),y)
+ifeq ($(strip $(CONFIG_DOSTATIC)),y)
LDFLAGS += --static
endif
diff -u -b -B -w -p -u -r1.3 config-deb
--- debian/config-deb 8 Dec 2002 20:45:47 -0000 1.3
+++ debian/config-deb 13 Dec 2002 19:07:06 -0000
@@ -19,10 +19,10 @@ CONFIG_FEATURE_INSTALLER=y
#
# Build Options
#
-# DOSTATIC is not set
-# DOLFS is not set
-# USING_CROSS_COMPILER is not set
-EXTRA_CFLAGS_OPTIONS=""
+# CONFIG_DOSTATIC is not set
+# CONFIG_DOLFS is not set
+# CONFIG_USING_CROSS_COMPILER is not set
+CONFIG_EXTRA_CFLAGS_OPTIONS=""
#
# Archival Utilities
@@ -347,4 +347,4 @@ CONFIG_FEATURE_MOUNT_LOOP=y
#
# Debugging Options
#
-# DODEBUG is not set
+# CONFIG_DODEBUG is not set
diff -u -b -B -w -p -u -r1.4 config-static
--- debian/config-static 8 Dec 2002 20:45:47 -0000 1.4
+++ debian/config-static 13 Dec 2002 19:07:07 -0000
@@ -19,10 +19,10 @@ CONFIG_FEATURE_DEVPTS=y
#
# Build Options
#
-DOSTATIC=y
-# DOLFS is not set
-# USING_CROSS_COMPILER is not set
-EXTRA_CFLAGS_OPTIONS=""
+CONFIG_DOSTATIC=y
+# CONFIG_DOLFS is not set
+# CONFIG_USING_CROSS_COMPILER is not set
+CONFIG_EXTRA_CFLAGS_OPTIONS=""
#
# Archival Utilities
@@ -433,4 +433,4 @@ CONFIG_FEATURE_MTAB_SUPPORT=y
#
# Debugging Options
#
-# DODEBUG is not set
+# CONFIG_DODEBUG is not set
diff -u -b -B -w -p -u -r1.6 config-udeb
--- debian/config-udeb 10 Dec 2002 11:28:40 -0000 1.6
+++ debian/config-udeb 13 Dec 2002 19:07:07 -0000
@@ -19,10 +19,10 @@ CONFIG_FEATURE_DEVPTS=y
#
# Build Options
#
-# DOSTATIC is not set
-# DOLFS is not set
-# USING_CROSS_COMPILER is not set
-EXTRA_CFLAGS_OPTIONS=""
+# CONFIG_DOSTATIC is not set
+# CONFIG_DOLFS is not set
+# CONFIG_USING_CROSS_COMPILER is not set
+CONFIG_EXTRA_CFLAGS_OPTIONS=""
#
# Archival Utilities
@@ -350,4 +350,4 @@ CONFIG_FEATURE_MOUNT_LOOP=y
#
# Debugging Options
#
-# DODEBUG is not set
+# CONFIG_DODEBUG is not set
diff -u -b -B -w -p -u -r1.21 rules
--- debian/rules 10 Dec 2002 11:28:40 -0000 1.21
+++ debian/rules 13 Dec 2002 19:07:07 -0000
@@ -10,7 +10,7 @@ VERSION = $(shell dpkg-parsechangelog |
ARCH = $(shell dpkg --print-architecture)
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- DODEBUG = true
+ CONFIG_DODEBUG = true
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
endif
@@ -20,19 +20,19 @@ build-arch-stamp:
$(MAKE) clean
cp ./debian/config-deb .config
$(MAKE) dep
- $(MAKE) DODEBUG=$(DODEBUG)
+ $(MAKE) CONFIG_DODEBUG=$(CONFIG_DODEBUG)
install busybox busybox-deb
$(MAKE) clean
cp ./debian/config-static .config
$(MAKE) dep
- $(MAKE) DODEBUG=$(DODEBUG)
+ $(MAKE) CONFIG_DODEBUG=$(CONFIG_DODEBUG)
install busybox busybox-static
$(MAKE) clean
cp ./debian/config-udeb .config
$(MAKE) dep
- $(MAKE) DODEBUG=$(DODEBUG)
+ $(MAKE) CONFIG_DODEBUG=$(CONFIG_DODEBUG)
$(MAKE) docs/BusyBox.1
diff -u -b -B -w -p -u -r1.3 Config.in
--- sysdeps/linux/Config.in 5 Dec 2002 21:25:20 -0000 1.3
+++ sysdeps/linux/Config.in 13 Dec 2002 19:07:10 -0000
@@ -106,14 +106,21 @@ endmenu
menu 'Build Options'
-config DOSTATIC
+config CONFIG_DOSTATIC
bool "Build BusyBox as a static binary (no shared libs)"
default n
help
If you want to build a static BusyBox binary, which does not
use or require any shared libraries, then enable this option.
+ This will make BusyBox be considerable larger, so you should
+ leave this option false unless you have a good reason (i.e.
+ your target platform does not support shared libraries, or
+ you are building an initrd which doesn't need anything but
+ BusyBox, etc).
-config DOLFS
+ Most people will leave this set to 'N'.
+
+config CONFIG_DOLFS
bool "Build with Large File Support (for accessing files > 2 GB)"
default n
help
@@ -124,17 +131,17 @@ config DOLFS
cp, mount, tar, and many others. If you want to access files larger
than 2 Gigabytes, enable this option. Otherwise, leave it set to 'N'.
-config USING_CROSS_COMPILER
+config CONFIG_USING_CROSS_COMPILER
bool "Do you want to build BusyBox with a Cross Compiler?"
default n
help
Do you want to build BusyBox with a Cross Compiler? If so,
then enable this option. Otherwise leave it set to 'N'.
-config CROSS_COMPILER_PREFIX
+config CONFIG_CROSS_COMPILER_PREFIX
string "Cross Compiler prefix"
default "/usr/i386-linux-uclibc/bin/i386-uclibc-"
- depends on USING_CROSS_COMPILER
+ depends on CONFIG_USING_CROSS_COMPILER
help
If you want to build BusyBox with a cross compiler, then you
will need to set this to the cross-compiler prefix. For example,
@@ -142,7 +149,7 @@ config CROSS_COMPILER_PREFIX
then I would enter '/usr/i386-linux-uclibc/bin/i386-uclibc-' here,
which will ensure the correct compiler is used.
-config EXTRA_CFLAGS_OPTIONS
+config CONFIG_EXTRA_CFLAGS_OPTIONS
string "Any extra CFLAGS options for the compiler?"
default ""
help
@@ -173,21 +180,7 @@ source util-linux/Config.in
menu 'Debugging Options'
-config DOSTATIC
- bool "Build BusyBox as a static binary (no shared libs)"
- default n
- help
- If you want to build a static BusyBox binary, which does not
- use or require any shared libraries, then enable this option.
- This will make BusyBox be considerable larger, so you should
- leave this option false unless you have a good reason (i.e.
- your target platform does not support shared libraries, or
- you are building an initrd which doesn't need anything but
- BusyBox, etc).
-
- Most people will leave this set to 'N'.
-
-config DODEBUG
+config CONFIG_DODEBUG
bool "Build BusyBox with Debugging symbols"
default n
help
@@ -199,10 +192,10 @@ config DODEBUG
Otherwise, answer N.
-config DODMALLOC
+config CONFIG_DODMALLOC
bool "Build BusyBox with dmalloc support"
default n
- depends on DODEBUG && !DOEFENCE
+ depends on CONFIG_DODEBUG && !CONFIG_DOEFENCE
help
This enables compiling with dmalloc ( http://dmalloc.com/ )
which is an excellent public domain mem leak and malloc problem
@@ -217,10 +210,10 @@ config DODMALLOC
This will make BusyBox be considerable larger and run slower, so
you should leave this option disabled for production use.
-config DOEFENCE
+config CONFIG_DOEFENCE
bool "Build BusyBox with Electric-fence support"
default n
- depends on DODEBUG && !DODMALLOC
+ depends on CONFIG_DODEBUG && !CONFIG_DODMALLOC
help
This enables compiling with Electric-fence support. Electric
fence is another very useful malloc debugging library which used
diff -u -b -B -w -p -u -r1.91 syslogd.c
--- sysklogd/syslogd.c 12 Dec 2002 10:54:48 -0000 1.91
+++ sysklogd/syslogd.c 13 Dec 2002 19:07:11 -0000
@@ -419,7 +419,7 @@ static void domark(int sig)
}
}
-/* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are
+/* This must be a #define, since when CONFIG_DODEBUG and BUFFERS_GO_IN_BSS are
* enabled, we otherwise get a "storage size isn't constant error. */
static int serveConnection(char *tmpbuf, int n_read)
{
diff -u -b -B -w -p -u -r1.33 tr.c
--- textutils/tr.c 31 Oct 2001 10:41:30 -0000 1.33
+++ textutils/tr.c 13 Dec 2002 19:07:12 -0000
@@ -31,7 +31,7 @@
#include <sys/types.h>
#include "busybox.h"
-/* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are
+/* This must be a #define, since when CONFIG_DODEBUG and BUFFERS_GO_IN_BSS are
* enabled, we otherwise get a "storage size isn't constant error. */
#define ASCII 0377
More information about the busybox
mailing list