sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adding missing dependency on libraries for hdboot

Browse source 
* Also cleanup a bit the makefile.
 * Also removing small inconsistency for arm builds where log would be
   skipped if doing a make hdboot, but not when cross-compiling.

Change-Id: Ic9e20655234a667ea8a967d05589d4df46c2d521
This commit is contained in:
Lionel Sambuc 2013-04-05 14:22:46 +02:00
parent b3cb63379e
commit 78cbcc9750
2 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
distrib/sets/lists/minix/md.evbarm
View file

@ -1,13 +1,15 @@
./boot/minix/.temp/mod07_tty minix-sys
./boot/minix/.temp/mod08_mfs minix-sys
./boot/minix/.temp/mod09_vm minix-sys
./boot/minix/.temp/mod10_pfs minix-sys
./boot/minix/.temp/mod11_init minix-sys
./multiboot/mod07_tty minix-sys
./multiboot/mod08_mfs minix-sys
./multiboot/mod09_vm minix-sys
./multiboot/mod10_pfs minix-sys
./multiboot/mod11_init minix-sys
./boot/minix/.temp/mod07_log minix-sys
./boot/minix/.temp/mod08_tty minix-sys
./boot/minix/.temp/mod09_mfs minix-sys
./boot/minix/.temp/mod10_vm minix-sys
./boot/minix/.temp/mod11_pfs minix-sys
./boot/minix/.temp/mod12_init minix-sys
./multiboot/mod07_log minix-sys
./multiboot/mod08_tty minix-sys
./multiboot/mod09_mfs minix-sys
./multiboot/mod10_vm minix-sys
./multiboot/mod11_pfs minix-sys
./multiboot/mod12_init minix-sys
./usr/include/arm/aeabi.h minix-sys
./usr/include/arm/ansi.h minix-sys
./usr/include/arm/arm26 minix-sys

57
releasetools/Makefile
View file

@ -24,9 +24,7 @@ PROGRAMS+= ${PROGROOT}/servers/pm/pm
PROGRAMS+= ${PROGROOT}/servers/sched/sched
PROGRAMS+= ${PROGROOT}/servers/vfs/vfs
PROGRAMS+= ${PROGROOT}/drivers/memory/memory
.if ${MACHINE_ARCH} == "i386"
PROGRAMS+= ${PROGROOT}/drivers/log/log
.endif
PROGRAMS+= ${PROGROOT}/drivers/tty/tty
PROGRAMS+= ${PROGROOT}/servers/mfs/mfs
PROGRAMS+= ${PROGROOT}/servers/vm/vm
@ -51,37 +49,39 @@ usage:
@echo " " >&2
@echo "To create a fresh MINIX configuration, try:" >&2
@echo " make clean install # new boot image" >&2
@echo " make fresh install # new everything" >&2
@echo " " >&2
all: services
# rebuild the program or system libraries
includes:
$(MAKE) -C ../ includes
${MAKE} -C ../ includes
libraries: includes
${MAKE} -C ../ do-lib
depend: includes .gitignore
$(MAKE) -C ../ depend
${MAKE} -C ../ depend
kernel: libraries
${MAKE} -C ../kernel
servers: libraries
${MAKE} -C ../servers all install
drivers: libraries servers
${MAKE} -C ../drivers all install
services: kernel servers drivers
.gitignore: Makefile
echo $(GEN_FILES) | tr ' ' '\n' >.gitignore
services: includes kernel servers .WAIT drivers
kernel: includes
$(MAKE) -C ../kernel
servers: includes
$(MAKE) -C ../servers all install
drivers: includes servers
$(MAKE) -C ../drivers all install
echo ${GEN_FILES} | tr ' ' '\n' >.gitignore
# make bootable and place system images
bootable:
exec su root mkboot bootable ${DESTDIR}
hdboot: services .WAIT do-hdboot
hdboot install: services .WAIT do-hdboot
do-hdboot:
@rm -rf ${DESTDIR}/boot/minix/.temp/
@ -106,9 +106,6 @@ do-hdboot:
${INSTALL} ${DESTDIR}/boot/minix/.temp/* ${DESTDIR}/multiboot; \
fi
install:
${MAKE} includes services hdboot
# download and update NetBSD reference sources.
nbsd_fetch:
export CVS_RSH=ssh; \
@ -135,12 +132,14 @@ nbsd_diff:
# clean up compile results
clean:
$(MAKE) -C ../kernel $@
$(MAKE) -C ../servers $@
$(MAKE) -C ../drivers $@
rm -rf $(GEN_FILES)
${MAKE} -C ../lib $@
${MAKE} -C ../kernel $@
${MAKE} -C ../servers $@
${MAKE} -C ../drivers $@
rm -rf ${GEN_FILES}
cleandepend::
$(MAKE) -C ../kernel $@
$(MAKE) -C ../servers $@
$(MAKE) -C ../drivers $@
cleandir:
${MAKE} -C ../lib $@
${MAKE} -C ../kernel $@
${MAKE} -C ../servers $@
${MAKE} -C ../drivers $@