Rename tools to releasetools

This is in preparation of NetBSD's tools directory to build tools
for cross compilation.

diff --git a/Makefile b/Makefile
index 7842197257f1aaeed3c86f7475c6c01cbf7f3f06..2e6b028e4d39c22260a3f58375807303f1d32d99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ usage:
        @echo " make install       # Compile and install commands"
        @echo " make clean         # Remove all compiler results"
        @echo "" 
-       @echo "Run 'make' in tools/ to create a new MINIX configuration." 
+       @echo "Run 'make' in releasetools/ to create a new MINIX configuration."
        @echo "" 
 
 # world has to be able to make a new system, even if there
@@ -81,14 +81,14 @@ install: .PHONY .MAKE
        ${MAKEDIRTARGET} man install
        ${MAKEDIRTARGET} man makedb
        ${MAKEDIRTARGET} share install
-       ${MAKEDIRTARGET} tools install
+       ${MAKEDIRTARGET} releasetools install
 
 clean: mkfiles .PHONY .MAKE
 .for dir in $(CMDSDIRS)
        ${MAKEDIRTARGET} ${dir} clean
 .endfor
        ${MAKEDIRTARGET} sys clean
-       ${MAKEDIRTARGET} tools clean
+       ${MAKEDIRTARGET} releasetools clean
        ${MAKEDIRTARGET} lib clean
        ${MAKEDIRTARGET} test clean
 
@@ -100,7 +100,7 @@ cleandepend: mkfiles .PHONY .MAKE
 
 # Shorthands
 all: .PHONY .MAKE dep-all
-       ${MAKEDIRTARGET} tools all
+       ${MAKEDIRTARGET} releasetools all
 
 # Obsolete targets
 elf-libraries: .PHONY

diff --git a/tools/Makefile b/releasetools/Makefile
similarity index 84%
rename from tools/Makefile
rename to releasetools/Makefile
index ea566aedd9a8a532d28ccf96369be262ae9fbd01..8352da635ca94bffe0dfc0dd77a4826716ed5e8f 100644 (file)
--- a/tools/Makefile
+++ b/releasetools/Makefile
@@ -11,19 +11,24 @@ GEN_FILES=  *.bak image kernel *.iso *.iso.gz cdfdimage rootimage src
 # Specify the programs that are part of the system image.
 KERNEL= kernel
 # PROGRAMS are in the order they should be loaded by boot
+.if ${MKBUILDEXT2RD} != "yes"
+FS=    ${NETBSDSRCDIR}/servers/mfs/mfs
+.else
+FS=    ${NETBSDSRCDIR}/servers/ext2/ext2
+.endif
 PROGRAMS= \
-       ../servers/ds/ds \
-       ../servers/rs/rs \
-       ../servers/pm/pm \
-       ../servers/sched/sched \
-       ../servers/vfs/vfs \
-       ../drivers/memory/memory \
-       ../drivers/log/log \
-       ../drivers/tty/tty \
-       ../servers/mfs/mfs \
-       ../servers/vm/vm \
-       ../servers/pfs/pfs \
-       ../servers/init/init
+       ${NETBSDSRCDIR}/servers/ds/ds \
+       ${NETBSDSRCDIR}/servers/rs/rs \
+       ${NETBSDSRCDIR}/servers/pm/pm \
+       ${NETBSDSRCDIR}/servers/sched/sched \
+       ${NETBSDSRCDIR}/servers/vfs/vfs \
+       ${NETBSDSRCDIR}/drivers/memory/memory \
+       ${NETBSDSRCDIR}/drivers/log/log \
+       ${NETBSDSRCDIR}/drivers/tty/tty \
+       ${FS} \
+       ${NETBSDSRCDIR}/servers/vm/vm \
+       ${NETBSDSRCDIR}/servers/pfs/pfs \
+       ${NETBSDSRCDIR}/servers/init/init
 
 usage: 
        @echo " " >&2
@@ -74,9 +79,9 @@ drivers: includes servers
 bootable:
        exec su root mkboot bootable
 
-hdboot:
+hdboot: services
        rm -rf ${DESTDIR}/boot/minix/.temp/
-       ${INSTALL_DIR} {DESTDIR}/boot/minix/.temp
+       mkdir -p ${DESTDIR}/boot/minix/.temp
 # mod_0 is used to make alphabetical order equal to the boot order
        for i in ${PROGRAMS};                                   \
        do                                                      \
@@ -97,15 +102,15 @@ fdboot:
        @sync
 
 install:
-       if [ ${DESTDIR}X != X ];                        \
-       then    ${MAKE} cross_install;                  \
-       else    ${MAKE} includes services hdboot;       \
-       fi
+.if ${MKBUILDEXT2RD} != "yes"
+       ${MAKE} includes services hdboot
+.else
+       ${MAKE} cross_install
+.endif
 
 cross_install:
        ${INSTALL_DIR} ${DESTDIR}/multiboot
-#ext2 might be needed
-       for i in ${PROGRAMS} ../servers/ext2/ext2;      \
+       for i in ${PROGRAMS};                                           \
        do                                                              \
        let n=n+1 >/dev/null;                                           \
        [ "$$n" -ge 10 ] && prefix="mod" || prefix="mod0";              \

diff --git a/tools/chrootmake.sh b/releasetools/chrootmake.sh
similarity index 100%
rename from tools/chrootmake.sh
rename to releasetools/chrootmake.sh

diff --git a/tools/issue.install b/releasetools/issue.install
similarity index 100%
rename from tools/issue.install
rename to releasetools/issue.install

diff --git a/tools/mkboot b/releasetools/mkboot
similarity index 100%
rename from tools/mkboot
rename to releasetools/mkboot

diff --git a/tools/nbsd.config b/releasetools/nbsd.config
similarity index 100%
rename from tools/nbsd.config
rename to releasetools/nbsd.config

diff --git a/tools/nbsd_diff.sh b/releasetools/nbsd_diff.sh
similarity index 100%
rename from tools/nbsd_diff.sh
rename to releasetools/nbsd_diff.sh

diff --git a/tools/nbsd_ports b/releasetools/nbsd_ports
similarity index 100%
rename from tools/nbsd_ports
rename to releasetools/nbsd_ports

diff --git a/tools/packages.install b/releasetools/packages.install
similarity index 100%
rename from tools/packages.install
rename to releasetools/packages.install

diff --git a/tools/release.functions b/releasetools/release.functions
similarity index 100%
rename from tools/release.functions
rename to releasetools/release.functions

diff --git a/tools/release.sh b/releasetools/release.sh
similarity index 100%
rename from tools/release.sh
rename to releasetools/release.sh

diff --git a/tools/release/cd/README.TXT b/releasetools/release/cd/README.TXT
similarity index 100%
rename from tools/release/cd/README.TXT
rename to releasetools/release/cd/README.TXT

diff --git a/tools/tell_config b/releasetools/tell_config
similarity index 100%
rename from tools/tell_config
rename to releasetools/tell_config