Rename tools to releasetools
This is in preparation of NetBSD's tools directory to build tools for cross compilation.
This commit is contained in:
parent
9b58157579
commit
7f99f3a293
13 changed files with 29 additions and 24 deletions
8
Makefile
8
Makefile
|
@ -17,7 +17,7 @@ usage:
|
||||||
@echo " make install # Compile and install commands"
|
@echo " make install # Compile and install commands"
|
||||||
@echo " make clean # Remove all compiler results"
|
@echo " make clean # Remove all compiler results"
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "Run 'make' in tools/ to create a new MINIX configuration."
|
@echo "Run 'make' in releasetools/ to create a new MINIX configuration."
|
||||||
@echo ""
|
@echo ""
|
||||||
|
|
||||||
# world has to be able to make a new system, even if there
|
# 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 install
|
||||||
${MAKEDIRTARGET} man makedb
|
${MAKEDIRTARGET} man makedb
|
||||||
${MAKEDIRTARGET} share install
|
${MAKEDIRTARGET} share install
|
||||||
${MAKEDIRTARGET} tools install
|
${MAKEDIRTARGET} releasetools install
|
||||||
|
|
||||||
clean: mkfiles .PHONY .MAKE
|
clean: mkfiles .PHONY .MAKE
|
||||||
.for dir in $(CMDSDIRS)
|
.for dir in $(CMDSDIRS)
|
||||||
${MAKEDIRTARGET} ${dir} clean
|
${MAKEDIRTARGET} ${dir} clean
|
||||||
.endfor
|
.endfor
|
||||||
${MAKEDIRTARGET} sys clean
|
${MAKEDIRTARGET} sys clean
|
||||||
${MAKEDIRTARGET} tools clean
|
${MAKEDIRTARGET} releasetools clean
|
||||||
${MAKEDIRTARGET} lib clean
|
${MAKEDIRTARGET} lib clean
|
||||||
${MAKEDIRTARGET} test clean
|
${MAKEDIRTARGET} test clean
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ cleandepend: mkfiles .PHONY .MAKE
|
||||||
|
|
||||||
# Shorthands
|
# Shorthands
|
||||||
all: .PHONY .MAKE dep-all
|
all: .PHONY .MAKE dep-all
|
||||||
${MAKEDIRTARGET} tools all
|
${MAKEDIRTARGET} releasetools all
|
||||||
|
|
||||||
# Obsolete targets
|
# Obsolete targets
|
||||||
elf-libraries: .PHONY
|
elf-libraries: .PHONY
|
||||||
|
|
|
@ -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.
|
# Specify the programs that are part of the system image.
|
||||||
KERNEL= kernel
|
KERNEL= kernel
|
||||||
# PROGRAMS are in the order they should be loaded by boot
|
# 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= \
|
PROGRAMS= \
|
||||||
../servers/ds/ds \
|
${NETBSDSRCDIR}/servers/ds/ds \
|
||||||
../servers/rs/rs \
|
${NETBSDSRCDIR}/servers/rs/rs \
|
||||||
../servers/pm/pm \
|
${NETBSDSRCDIR}/servers/pm/pm \
|
||||||
../servers/sched/sched \
|
${NETBSDSRCDIR}/servers/sched/sched \
|
||||||
../servers/vfs/vfs \
|
${NETBSDSRCDIR}/servers/vfs/vfs \
|
||||||
../drivers/memory/memory \
|
${NETBSDSRCDIR}/drivers/memory/memory \
|
||||||
../drivers/log/log \
|
${NETBSDSRCDIR}/drivers/log/log \
|
||||||
../drivers/tty/tty \
|
${NETBSDSRCDIR}/drivers/tty/tty \
|
||||||
../servers/mfs/mfs \
|
${FS} \
|
||||||
../servers/vm/vm \
|
${NETBSDSRCDIR}/servers/vm/vm \
|
||||||
../servers/pfs/pfs \
|
${NETBSDSRCDIR}/servers/pfs/pfs \
|
||||||
../servers/init/init
|
${NETBSDSRCDIR}/servers/init/init
|
||||||
|
|
||||||
usage:
|
usage:
|
||||||
@echo " " >&2
|
@echo " " >&2
|
||||||
|
@ -74,9 +79,9 @@ drivers: includes servers
|
||||||
bootable:
|
bootable:
|
||||||
exec su root mkboot bootable
|
exec su root mkboot bootable
|
||||||
|
|
||||||
hdboot:
|
hdboot: services
|
||||||
rm -rf ${DESTDIR}/boot/minix/.temp/
|
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
|
# mod_0 is used to make alphabetical order equal to the boot order
|
||||||
for i in ${PROGRAMS}; \
|
for i in ${PROGRAMS}; \
|
||||||
do \
|
do \
|
||||||
|
@ -97,15 +102,15 @@ fdboot:
|
||||||
@sync
|
@sync
|
||||||
|
|
||||||
install:
|
install:
|
||||||
if [ ${DESTDIR}X != X ]; \
|
.if ${MKBUILDEXT2RD} != "yes"
|
||||||
then ${MAKE} cross_install; \
|
${MAKE} includes services hdboot
|
||||||
else ${MAKE} includes services hdboot; \
|
.else
|
||||||
fi
|
${MAKE} cross_install
|
||||||
|
.endif
|
||||||
|
|
||||||
cross_install:
|
cross_install:
|
||||||
${INSTALL_DIR} ${DESTDIR}/multiboot
|
${INSTALL_DIR} ${DESTDIR}/multiboot
|
||||||
#ext2 might be needed
|
for i in ${PROGRAMS}; \
|
||||||
for i in ${PROGRAMS} ../servers/ext2/ext2; \
|
|
||||||
do \
|
do \
|
||||||
let n=n+1 >/dev/null; \
|
let n=n+1 >/dev/null; \
|
||||||
[ "$$n" -ge 10 ] && prefix="mod" || prefix="mod0"; \
|
[ "$$n" -ge 10 ] && prefix="mod" || prefix="mod0"; \
|
Loading…
Reference in a new issue