Move readlink, mktemp, run-parts and which to a new debianutils dir.

16 files changed, 86 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 9a9780ec9..d61d945a6 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
 TOPDIR:= $(shell /bin/pwd)/
 include $(TOPDIR).config
 include $(TOPDIR)Rules.mak
-SUBDIRS:=applets archival archival/libunarchive console-tools \
+SUBDIRS:=applets archival archival/libunarchive console-tools debianutils \
         editors fileutils findutils init miscutils modutils networking \
         networking/libiproute networking/udhcp procps loginutils shell \
         shellutils sysklogd textutils util-linux libbb libpwdgrp
diff --git a/debianutils/Makefile b/debianutils/Makefile
new file mode 100644
index 000000000..35b32e73b
--- /dev/null
+++ b/debianutils/Makefile
@@ -0,0 +1,30 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2002 Erik Andersen <andersee@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+TOPDIR:= ../
+DEBIANUTILS_DIR:=./
+include $(TOPDIR).config
+include $(TOPDIR)Rules.mak
+include Makefile.in
+all: $(libraries-y)
+-include $(TOPDIR).depend
+
+clean:
+        rm -f *.o *.a $(AR_TARGET)
+
diff --git a/debianutils/Makefile.in b/debianutils/Makefile.in
new file mode 100644
index 000000000..91887bda1
--- /dev/null
+++ b/debianutils/Makefile.in
@@ -0,0 +1,36 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2002 Erik Andersen <andersee@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+DEBIANUTILS_AR:=debianutils.a
+ifndef $(DEBIANUTILS_DIR)
+DEBIANUTILS_DIR:=$(TOPDIR)debianutils/
+endif
+
+
+DEBIANUTILS-y:=
+DEBIANUTILS-$(CONFIG_MKTEMP)            += mktemp.o
+DEBIANUTILS-$(CONFIG_READLINK)          += readlink.o
+DEBIANUTILS-$(CONFIG_RUN_PARTS)         += run_parts.o
+DEBIANUTILS-$(CONFIG_WHICH)             += which.o
+
+libraries-y+=$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR)
+
+$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR): $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y))
+        $(AR) -ro $@ $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y))
+
diff --git a/debianutils/config.in b/debianutils/config.in
new file mode 100644
index 000000000..7b1d92991
--- /dev/null
+++ b/debianutils/config.in
@@ -0,0 +1,15 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+mainmenu_option next_comment
+comment 'Debian Utilities'
+
+bool 'mktemp'       CONFIG_MKTEMP
+bool 'readlink'     CONFIG_READLINK
+bool 'run-parts'    CONFIG_RUN_PARTS
+bool 'which'        CONFIG_WHICH
+
+endmenu
+
diff --git a/miscutils/mktemp.c b/debianutils/mktemp.c
index bc47d0af0..bc47d0af0 100644
--- a/miscutils/mktemp.c
+++ b/debianutils/mktemp.c
diff --git a/miscutils/readlink.c b/debianutils/readlink.c
index da5259038..da5259038 100644
--- a/miscutils/readlink.c
+++ b/debianutils/readlink.c
diff --git a/init/run_parts.c b/debianutils/run_parts.c
index 3ec4b9d10..3ec4b9d10 100644
--- a/init/run_parts.c
+++ b/debianutils/run_parts.c
diff --git a/findutils/which.c b/debianutils/which.c
index b2af5a8ea..b2af5a8ea 100644
--- a/findutils/which.c
+++ b/debianutils/which.c
diff --git a/findutils/Makefile.in b/findutils/Makefile.in
index 2deaadb05..4133d1c3f 100644
--- a/findutils/Makefile.in
+++ b/findutils/Makefile.in
@@ -25,7 +25,6 @@ endif
 FINDUTILS-y:=
 FINDUTILS-$(CONFIG_FIND)        += find.o
 FINDUTILS-$(CONFIG_GREP)        += grep.o
-FINDUTILS-$(CONFIG_WHICH)       += which.o
 FINDUTILS-$(CONFIG_XARGS)       += xargs.o
 
 libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR)
diff --git a/findutils/config.in b/findutils/config.in
index d5a3714d2..41a23c00a 100644
--- a/findutils/config.in
+++ b/findutils/config.in
@@ -18,7 +18,6 @@ if [ "$CONFIG_GREP" = "y" ] ; then
     bool '  Support extended regular expressions (egrep & grep -E)'             CONFIG_FEATURE_GREP_EGREP_ALIAS
     bool '  Enable before and after context flags (-A, -B and -C)'      CONFIG_FEATURE_GREP_CONTEXT
 fi
-bool 'which'        CONFIG_WHICH
 bool 'xargs'        CONFIG_XARGS
 endmenu
 
diff --git a/include/usage.h b/include/usage.h
index b741360cf..3677dff7a 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -2262,6 +2262,7 @@
 #define which_example_usage \
         "$ which login\n" \
         "/bin/login\n"
+
 #define who_trivial_usage \
         " "
 #define who_full_usage \
diff --git a/init/Makefile.in b/init/Makefile.in
index cd3ead839..a43c4a7f4 100644
--- a/init/Makefile.in
+++ b/init/Makefile.in
@@ -29,7 +29,6 @@ INIT-$(CONFIG_MESG)			+= mesg.o
 INIT-$(CONFIG_POWEROFF)                 += poweroff.o
 INIT-$(CONFIG_REBOOT)                   += reboot.o
 INIT-$(CONFIG_START_STOP_DAEMON)        += start_stop_daemon.o
-INIT-$(CONFIG_RUN_PARTS)                += run_parts.o
 
 libraries-y+=$(INIT_DIR)$(INIT_AR)
 
diff --git a/init/config.in b/init/config.in
index e4aa4fbba..3688eaa10 100644
--- a/init/config.in
+++ b/init/config.in
@@ -21,7 +21,6 @@ if [ "$CONFIG_INIT" = "y" ]; then
 fi
 
 bool 'start-stop-daemon'            CONFIG_START_STOP_DAEMON
-bool 'run-parts'                    CONFIG_RUN_PARTS
 bool 'mesg'                         CONFIG_MESG
         
 endmenu
diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in
index 72292b69d..535e65467 100644
--- a/miscutils/Makefile.in
+++ b/miscutils/Makefile.in
@@ -30,9 +30,7 @@ MISCUTILS-$(CONFIG_CRONTAB)             += crontab.o
 MISCUTILS-$(CONFIG_DC)                  += dc.o
 MISCUTILS-$(CONFIG_DUTMP)               += dutmp.o
 MISCUTILS-$(CONFIG_MAKEDEVS)            += makedevs.o
-MISCUTILS-$(CONFIG_MKTEMP)              += mktemp.o
 MISCUTILS-$(CONFIG_MT)                  += mt.o
-MISCUTILS-$(CONFIG_READLINK)            += readlink.o
 MISCUTILS-$(CONFIG_STRINGS)             += strings.o
 MISCUTILS-$(CONFIG_TIME)                += time.o
 MISCUTILS-$(CONFIG_UPDATE)              += update.o
diff --git a/miscutils/config.in b/miscutils/config.in
index 3dc5e2c8b..063e02b36 100644
--- a/miscutils/config.in
+++ b/miscutils/config.in
@@ -12,9 +12,7 @@ bool 'crontab'      CONFIG_CRONTAB
 bool 'dc'           CONFIG_DC
 bool 'dutmp'        CONFIG_DUTMP
 bool 'makedevs'     CONFIG_MAKEDEVS
-bool 'mktemp'       CONFIG_MKTEMP
 bool 'mt'           CONFIG_MT
-bool 'readlink'     CONFIG_READLINK
 bool 'strings'      CONFIG_STRINGS
 bool 'time'         CONFIG_TIME
 bool 'update'       CONFIG_UPDATE
diff --git a/sysdeps/linux/config.in b/sysdeps/linux/config.in
index dac74e8e0..d33a9826d 100644
--- a/sysdeps/linux/config.in
+++ b/sysdeps/linux/config.in
@@ -31,18 +31,19 @@ endmenu
 
 source archival/config.in
 source console-tools/config.in
+source debianutils/config.in
 source editors/config.in
+source fileutils/config.in
 source findutils/config.in
 source init/config.in
+source loginutils/config.in
 source miscutils/config.in
 source modutils/config.in
 source networking/config.in
-source loginutils/config.in
 source procps/config.in
 source shell/config.in
 source shellutils/config.in
 source sysklogd/config.in
 source textutils/config.in
 source util-linux/config.in
-source fileutils/config.in