[Zrouter-src] ZRouter.org: push to ZRouter share/mk/converters/ffs.mk share/mk...

Sat Dec 31 13:21:00 UTC 2011

details:   http://zrouter.org/hg/zrouter//rev/662f4f1f3fee
changeset: 300:662f4f1f3fee
user:      ray at terran.dlink.ua
date:      Sat Dec 31 15:20:22 2011 +0200
description:
Add dependency for frash makefs for iso/ffs converters.
Build new makefs and install it under ${OBJ}/..../zrouter/tools.

diffstat:

 share/mk/converters/ffs.mk |  2 +-
 share/mk/converters/iso.mk |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r e3a095f19dfa -r 662f4f1f3fee share/mk/converters/ffs.mk

--- a/share/mk/converters/ffs.mk	Sat Dec 31 15:17:18 2011 +0200
+++ b/share/mk/converters/ffs.mk	Sat Dec 31 15:20:22 2011 +0200
@@ -6,7 +6,7 @@
 CONVERTER_FFS_FLAGS?=-t ffs -d 255 -F ${ZROUTER_ROOT}/tools/rootfs.mtree -s \
     ${ROOTFS_MEDIA_SIZE} -o minfree=0,version=1 ${ROOTFS_ENDIAN_FLAGS}
 
-${CONVERT_TO_FFS}:		${CONVERT_FROM_FFS}
+${CONVERT_TO_FFS}:		${ZTOOLS_PATH}/makefs ${CONVERT_FROM_FFS}
 	@echo -n "========== Convert ${CONVERT_FROM_FFS} to ${CONVERT_TO_FFS}"
 	@echo " with ${CONVERTER_FFS} ============"
 	PATH=${IMAGE_BUILD_PATHS} ${CONVERTER_FFS} ${CONVERTER_FFS_FLAGS} "${CONVERT_TO_FFS}" "${CONVERT_FROM_FFS}"
\ No newline at end of file
diff -r e3a095f19dfa -r 662f4f1f3fee share/mk/converters/iso.mk
--- a/share/mk/converters/iso.mk	Sat Dec 31 15:17:18 2011 +0200
+++ b/share/mk/converters/iso.mk	Sat Dec 31 15:20:22 2011 +0200
@@ -5,7 +5,7 @@
 CONVERTER_ISO?=makefs
 CONVERTER_ISO_FLAGS?=-d 255 -t cd9660 -F ${ZROUTER_ROOT}/tools/rootfs.mtree -o "rockridge"
 
-${CONVERT_TO_ISO}:		${CONVERT_FROM_ISO}
+${CONVERT_TO_ISO}:		${ZTOOLS_PATH}/makefs ${CONVERT_FROM_ISO}
 	@echo -n "========== Convert ${CONVERT_FROM_ISO} to ${CONVERT_TO_ISO}"
 	@echo " with ${CONVERTER_ISO} ============"
 	PATH=${IMAGE_BUILD_PATHS} ${CONVERTER_ISO} ${CONVERTER_ISO_FLAGS} "${CONVERT_TO_ISO}" "${CONVERT_FROM_ISO}"
\ No newline at end of file
