diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-05 14:17:08 +0400 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-05 14:17:08 +0400 |
| commit | 7d219aab70e6951ab82c27c202cac05016696723 (patch) | |
| tree | 4c0679bfa391f71aee9b51505a5d3dc8f60a0cf7 /runit | |
| parent | 8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 (diff) | |
build system overhaul
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/Config.in | 10 | ||||
| -rw-r--r-- | runit/Kbuild | 8 | ||||
| -rw-r--r-- | runit/Makefile | 23 | ||||
| -rw-r--r-- | runit/Makefile.in | 42 |
4 files changed, 13 insertions, 70 deletions
diff --git a/runit/Config.in b/runit/Config.in index 073ca1425..b90b0232e 100644 --- a/runit/Config.in +++ b/runit/Config.in @@ -5,30 +5,30 @@ menu "Runit Utilities" -config CONFIG_CHPST +config CHPST bool "chpst" default n help chpst changes the process state according to the given options, and execs specified program. -config CONFIG_SETUIDGID +config SETUIDGID bool "setuidgid" help Sets soft resource limits as specified by options -config CONFIG_ENVUIDGID +config ENVUIDGID bool "envuidgid" help Sets $UID to account's uid and $GID to account's gid -config CONFIG_ENVDIR +config ENVDIR bool "envdir" help Sets various environment variables as specified by files in the given directory -config CONFIG_SOFTLIMIT +config SOFTLIMIT bool "softlimit" help Sets soft resource limits as specified by options diff --git a/runit/Kbuild b/runit/Kbuild new file mode 100644 index 000000000..9fee84224 --- /dev/null +++ b/runit/Kbuild @@ -0,0 +1,8 @@ +# Makefile for busybox +# +# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> +# +# Licensed under the GPL v2, see the file LICENSE in this tarball. + +lib-y:= +lib-$(CONFIG_CHPST) += chpst.o uidgid.o diff --git a/runit/Makefile b/runit/Makefile deleted file mode 100644 index be65856fe..000000000 --- a/runit/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> -# -# Licensed under the GPL v2, see the file LICENSE in this tarball. - -ifndef top_srcdir -top_srcdir=.. -endif -ifndef top_builddir -top_builddir=.. -endif -srcdir=$(top_srcdir)/runit -RUNIT_DIR:=./ -include $(top_srcdir)/Rules.mak -include $(top_builddir)/.config -include Makefile.in -all: $(libraries-y) --include $(top_builddir)/.depend - -clean: - rm -f *.o *.a $(AR_TARGET) - diff --git a/runit/Makefile.in b/runit/Makefile.in deleted file mode 100644 index d8cea10c2..000000000 --- a/runit/Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> -# -# Licensed under the GPL v2, see the file LICENSE in this tarball. - -RUNIT_AR:=runit.a -ifndef RUNIT_DIR -RUNIT_DIR:=$(top_builddir)/runit/ -endif -srcdir=$(top_srcdir)/runit - -#unix_a:=buffer.o \ -#buffer_get.o buffer_put.o buffer_read.o buffer_write.o coe.o \ -#fd_copy.o fd_move.o fifo.o lock_ex.o lock_exnb.o \ -#ndelay_off.o ndelay_on.o open_append.o open_read.o \ -#open_trunc.o open_write.o openreadclose.o pathexec_env.o \ -#pathexec_run.o prot.o readclose.o seek_set.o sig.o \ -#sig_block.o sig_catch.o sig_pause.o stralloc_cat.o stralloc_catb.o \ -#stralloc_cats.o stralloc_eady.o stralloc_opyb.o stralloc_opys.o \ -#stralloc_pend.o wait_nohang.o \ -#wait_pid.o - -RUNIT-y:= -RUNIT-$(CONFIG_CHPST) += chpst.o uidgid.o - -RUNIT-y:=$(sort $(RUNIT-y)) - -ifneq ($(strip $(RUNIT-y)),) -libraries-y+=$(RUNIT_DIR)$(RUNIT_AR) -endif - -RUNIT_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(RUNIT-y)) -RUNIT_SRC-a:=$(wildcard $(srcdir)/*.c) -APPLET_SRC-y+=$(RUNIT_SRC-y) -APPLET_SRC-a+=$(RUNIT_SRC-a) - -$(RUNIT_DIR)$(RUNIT_AR): $(patsubst %,$(RUNIT_DIR)%, $(RUNIT-y)) - $(do_ar) - -$(RUNIT_DIR)%.o: $(srcdir)/%.c - $(compile.c) |