Commit Graph

379 Commits

Author SHA1 Message Date
Rob Landley
786988faf7 Tweak allbareconfig not to pause. 2006-03-22 15:24:24 +00:00
Eric Andersen
a6db0eef59 Willy Tarreau writes:
I encountered a little typo in 'make help' : the prefix was
noted "$prefix" instead of "$(PREFIX)".
2006-03-20 17:50:08 +00:00
Bernhard Reutner-Fischer
a25d83b282 - remove superfluous dependency which was fixed in r14527 2006-03-13 19:30:06 +00:00
Bernhard Reutner-Fischer
df10094870 - revert back to r14406 2006-03-13 19:04:00 +00:00
Rob Landley
19808fea76 "make help" should not build the configurator first. 2006-03-13 03:19:46 +00:00
Rob Landley
9dc6913896 Fix "rm .config;make menuconfig" to work like "rm .config; make" (I.E. do
defconfig first), and group busybox administrative settings into a sub-menu.
2006-03-13 02:52:23 +00:00
Rob Landley
31e3610c4b Cleanup from Paul Fox. One find piped to xargs is faster/simpler than
lots of finds doing individual -exec rm.
2006-03-09 22:01:05 +00:00
Bernhard Reutner-Fischer
07a79e75f5 - backout using features which are not available with the previous stable
version of make (3.71.1).
2006-03-09 09:03:37 +00:00
Bernhard Reutner-Fischer
a59721166a - work around missing features and bugs in make-3.79.1:
- no order-only prerequisites; incomplete workaround (see comment in diff)
- no internal variable MAKEFILE_LIST; workaround
- define bar\nfoo:=<long-list>  doesn't work; workaround
also:
- reinstate clean, distclean as noconfig_target.
- unconditionally clean libbusybox.so*
2006-03-06 14:19:15 +00:00
Mike Frysinger
56ee779074 clean *.osm as pointed out by Robert P. J. Day 2006-03-05 18:04:23 +00:00
Mike Frysinger
33b45a09a1 clean busybox_unstripped as pointed out by Robert P. J. Day 2006-03-05 16:25:19 +00:00
Bernhard Reutner-Fischer
7ad83b4e2c - ar cruP doesn't replace ('r') but unconditionally _adds_ all objects.
landley, that one broke your tar-testing (see below).

To see the issue i was talking about in the comment to rev. 14431, remove the
'P' from ARFLAGS in Rules.mak, then recompile.

You will see undefined references to these symbols:
iplink_main
iproute_main
iptunnel_main
login_main
run_parts_main


These are due to the fact that these applets (named e.g. login.o) clash with
libbb/login.o, for example. So ar sees that we're going to add login.o
(the applet!) and does so. Later on, we add libbb/login.o (just the basename
is used, so login.o). and this libbb/login.o *replaces* the login.o (the
applet!).

I therefor want (you) to rename abovementioned files from libbb to have
a prefix bb_ (e.g. svn mv libbb/login.c libbb/bb_login.c) to avoid these
clashed.

ok?
TIA,
2006-03-03 14:19:15 +00:00
Bernhard Reutner-Fischer
e3ec99de82 - remove unused lists *-m 2006-03-02 18:23:13 +00:00
Bernhard Reutner-Fischer
c8e278f54b - make sure applets.o is rebuilt when the .config changes.
- don't overwrite objects in the archive. Affected applets with name-clash
  mostly vs. libbb:
iplink_main
iproute_main
iptunnel_main
login_main
run_parts_main
2006-03-02 18:13:05 +00:00
Bernhard Reutner-Fischer
9b6b894422 - allow for make /path/to/dir/file.o 2006-03-02 17:38:15 +00:00
Bernhard Reutner-Fischer
cfc5d860e6 Denis Vlasenko writes: make sizes was rebuilding busybox - unstripped one! 2006-03-02 09:44:32 +00:00
Bernhard Reutner-Fischer
5d26126b9e - fixes parallel builds (make -j)
- use less resources for the buildsystem itself
2006-03-01 22:54:48 +00:00
Rob Landley
8bbee85214 defconfig shouldn't enable CONFIG_INSTALL_NO_USR, and while we're at it
remove residue of old defconfig and tweak "make with no config" to run
defconfig before bringing up menuconfig.
2006-02-28 05:26:13 +00:00
Mike Frysinger
611e085c20 kill all .depend files 2006-02-18 20:13:22 +00:00
Mike Frysinger
a568ef2343 hide bb_mkdep build 2006-02-18 20:12:39 +00:00
"Vladimir N. Oleynik"
6732af2766 full removed config.h, use bb_config.h only 2006-02-15 12:29:37 +00:00
Rob Landley
7bfa88f315 New USE() macros
For each CONFIG_SYMBOL, include/bb_config.h now has both ENABLE_SYMBOL
and USE_SYMBOL(x).  ENABLE_SYMBOL is still always defined (1 or 0) so that
if(ENABLE) should optimize out when it's zero.  The USE_SYMBOL(X) will only
splice in X if the symbol is defined, otherwise it'll be empty.

Thus we can convert this:

#ifdef CONFIG_ARGS
    opt = bb_getopt_ulflags(argc, argv, "ab:c"
#ifdef CONFIG_THINGY
        "d:"
#endif
        , &bvalue
#ifdef CONFIG_THINGY
        , &thingy
#endif
    );
#endif

into this:
    if (ENABLE_ARGS) {
        opt = bb_getopt_ulflags(argc, argv, "ab:c" USE_THINGY("d:"), &bvalue
                USE_THINGY(, &thingy));
    }

And it should produce the same code.

Unlike the old versions in include/_usage.h, the new USE_SYMBOL(x) can handle
commas in its arguments (as shown above).  (The _usage.h file is obsolete and
no longer generated.)

Nobody should need to include config.h directly anymore, bb_config.h should
define all the configuration stuff we need.  Someday, the CONFIG_SYMBOL
versions should go away in favor of ENABLE_SYMBOL and USE_SYMBOL().

Thanks to vodz for the new version of bb_mkdep.c that works with function
macros.
2006-02-13 19:16:41 +00:00
Rob Landley
1ab4c3dc25 Help text update and tweak to defconfig to remove two more things that
the "maximum sane configuration" shouldn't have.  (Explicit MTAB support in
mount, which you should only need if you have no /proc, and FEATURE_CLEAN_UP,
which exists to humor valgrind and otherwise just bloats the code).
2006-02-08 18:50:17 +00:00
Mike Frysinger
f37529d6b6 if the .pl script gets updated, force doc regen 2006-02-05 22:15:39 +00:00
Mike Frysinger
b38673fb9f make the build system puuuuuuuuuuurty 2006-02-02 01:41:53 +00:00
Bernhard Reutner-Fischer
81b94960a2 - pass -static via CC rather than LD 2006-01-31 11:29:22 +00:00
Rob Landley
a167ec5e63 Turn defconfig into what make allyesconfig is today. Turn allyesconfig
back into allyesconfig.  (Memo: apparently SELINUX doesn't compile anymore.)

Make defconfig shouldn't switch on libbusybox.so, but allyesconfig does.
2006-01-31 02:42:50 +00:00
Rob Landley
f8fd4db92f Move SUSv2 obsolete feature disabling to debug menu, invert meaning of
symbol (switched on to remove now: test your apps to make sure they _don't_
do this, because as some point we should just yank it), fixup head/tail/fold.

Also tweak "make allyesconfig" so anything starting with CONFIG_DEBUG gets
left switched off.  Possibly other things we want to put in the debug menu?
2006-01-30 01:30:39 +00:00
Bernhard Reutner-Fischer
08a1b5095d - add a macro to check for ld and as flags
Very unreliable as e.g the ld check will see the flags supported by each emulation, not just the active one.
  good enough for now..
  Fix would be to crate one or more dummy .c files and accually try if a flag
  works.
2006-01-27 15:45:56 +00:00
Bernhard Reutner-Fischer
08c5a1789b - Simplify the prereq and add more documentation.
- Fix regex for allyesconfig.
2006-01-25 15:58:04 +00:00
Bernhard Reutner-Fischer
9ed6ac2bea - Turn off combine for allyesconfig and allbareconfig.
The user ought to explicitely request this.
2006-01-24 18:15:20 +00:00
"Vladimir N. Oleynik"
b757699164 Oops, restore tabs 2006-01-23 11:39:05 +00:00
"Vladimir N. Oleynik"
9394b232ef cleanup (dist)clean logic 2006-01-23 11:24:58 +00:00
Bernhard Reutner-Fischer
86f5c9906b - add platform.h.
- use shorter boilerplate while at it.
2006-01-22 22:55:11 +00:00
Rob Landley
7a43bd07e6 Zap sysdeps directory, moving Config.in and defconfig to top of tree.
(Busybox should not be system dependent enough to have different default
configurations for different platforms.  We're not a kernel.)
2006-01-20 17:47:09 +00:00
Bernhard Reutner-Fischer
7ca61b6f33 - shared libbusybox.
- IMA compilation option (aka IPO, IPA,..)
Please holler if i broke something..
2006-01-15 14:04:57 +00:00
Bernhard Reutner-Fischer
26ea0b7f16 - turn off "nc gaping hole" and devfsd in allbareconfig, the latter doesn't
use the FEATURE notation and noone will update it to use it.
2006-01-13 16:25:03 +00:00
Rob Landley
a930bd3332 Stephane Billiart said:
the attached patch makes applet list in busybox.links
correctly include tr and watchdog.
Currently, they don't appear because they are prefixed
with ENABLE_ in include/applets.h
2005-12-16 06:12:46 +00:00
Rob Landley
d4f15e95d6 Install links patch from Yann E. Morin. (Another thing hanging around in my
tree forever.  Tweaked the docs a bit.)
2005-12-02 18:27:39 +00:00
Rob Landley
2d5d88ebc0 Two changes. One from Shaun Jackman makes libbb/interface.c compile only if
it's going to be used.  (I'm guessing it doesn't work with newlib.)

The other one is from me: allyesconfig shouldn't enable devfs because that
changes all sorts of unrelated stuff (like /dev/loop0->dev/loop/0), which
can come as a bit of a surprise.  (It's still there, but you have to go into
menuconfig and select it manually.)
2005-10-25 02:19:55 +00:00
Bernhard Reutner-Fischer
8c7a7e6e63 - split VERSION into parts
- add some filesystem operation wrapper variables for use in the makefiles and
  pull them in early in the toplevel makefile
- use the cross-toolchain for "make sizes"
2005-10-13 10:40:18 +00:00
Bernhard Reutner-Fischer
332fc1006c - remove passing PREFIX and CROSS to make which was added for bug #94.
My recent Makefile touch-up assures that make O=/tmp/o PREFIX=/tmp/i install
  works as expected without this ugly workaround.
2005-10-09 19:12:34 +00:00
Bernhard Reutner-Fischer
be5c10314d - rename bareconfig to allbareconfig and emit "is not set" strings needed for
oldconfig.
2005-10-08 11:08:28 +00:00
Bernhard Reutner-Fischer
a9d8913bc7 - add config target bareconfig. Enables all applets but without any features.
Rob wanted to have regression tests if a bug crops up. Here you are wrt find :)
2005-10-07 18:45:03 +00:00
"Vladimir N. Oleynik"
dfd1eb0387 trim dep lines 2005-10-07 15:53:21 +00:00
Bernhard Reutner-Fischer
4d63525f76 - fix bug #94: 'make install' does not respect PREFIX nor CROSS when using O=
- other minor cosmetic tweaks while at it
2005-10-07 10:53:15 +00:00
Bernhard Reutner-Fischer
e34e8782a9 - support make check V=1 to run the checks in verbose mode
- pass verbose from runtest to testing.sh
2005-10-06 12:48:03 +00:00
Bernhard Reutner-Fischer
14b1c1da9a - remove explicit dependency of busybox.o and applets.o and usage.h from the
Makefile. Instead fix the invocation of bb_mkdep.
2005-10-05 14:52:21 +00:00
Bernhard Reutner-Fischer
b48bfe795e - fix generation of .depend when building out of tree.
point bb_mkdep to the source directory and not the build-directory.
2005-10-05 13:55:45 +00:00
Bernhard Reutner-Fischer
5c071bcf2f - fix building out-of-tree;
to test, checkout the source (let's assume /scratch/src/busybox), then
  mkdir /tmp/bb ; cd /tmp/bb
  make top_srcdir=/scratch/src/busybox O="$(pwd)" -f /scratch/src/busybox/Makefile allyesconfig check
- default to O=$(pwd) if no O was specified. Now you can just specify
  the top_srcdir (without O=/somewhere) to create the obj-tree in pwd.
- make "make configtarget buildtarget" work. Previously this didn't
  work due to how HAVE_DOT_CONFIG was evaluated. Two separate steps were
  needed before, e.g. make config ; make busybox.
- remove some unneeded variables from Rules.mak (BB_SRC_DIR from Mr.
  ldoolitt@recycle.lbl) which suggest that the stuff fixed above
  didn't work before.
- move selinux libraries to where they belong (from Makefile to Rules.mak)
- update the docs to mention svn instead of cvs and provide an example
  for building out-of-tree in INSTALL.
2005-10-05 07:40:46 +00:00