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

Wed Jan 4 15:47:12 UTC 2012

details:   http://zrouter.org/hg/zrouter//rev/b0b3021badc7
changeset: 306:b0b3021badc7
user:      ray at terran.dlink.ua
date:      Wed Jan 04 17:47:48 2012 +0200
description:
Use mtree spec to chown rootfs files to root.
(Not require su or sudo)

diffstat:

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

diffs (32 lines):

diff -r c230dd90b13a -r b0b3021badc7 share/mk/converters/ffs.mk

--- a/share/mk/converters/ffs.mk	Wed Jan 04 17:46:42 2012 +0200
+++ b/share/mk/converters/ffs.mk	Wed Jan 04 17:47:48 2012 +0200
@@ -3,10 +3,11 @@
 
 # Let user to override
 CONVERTER_FFS?=makefs
-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}
+CONVERTER_FFS_FLAGS?=-t ffs -d 255 -F ${ROOTFS_CLEAN_MTREE_FILE} \
+    -s ${ROOTFS_MEDIA_SIZE} -o minfree=0,version=1 ${ROOTFS_ENDIAN_FLAGS}
 
 ${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
+	PATH=${IMAGE_BUILD_PATHS} ${CONVERTER_FFS} ${CONVERTER_FFS_FLAGS} \
+	    "${CONVERT_TO_FFS}" "${CONVERT_FROM_FFS}"
\ No newline at end of file
diff -r c230dd90b13a -r b0b3021badc7 share/mk/converters/iso.mk
--- a/share/mk/converters/iso.mk	Wed Jan 04 17:46:42 2012 +0200
+++ b/share/mk/converters/iso.mk	Wed Jan 04 17:47:48 2012 +0200
@@ -3,7 +3,7 @@
 
 # Let user to override
 CONVERTER_ISO?=makefs
-CONVERTER_ISO_FLAGS?=-d 255 -t cd9660 -F ${ZROUTER_ROOT}/tools/rootfs.mtree -o "rockridge"
+CONVERTER_ISO_FLAGS?=-d 255 -t cd9660 -F ${ROOTFS_CLEAN_MTREE_FILE} -o "rockridge"
 
 ${CONVERT_TO_ISO}:		${ZTOOLS_PATH}/makefs ${CONVERT_FROM_ISO}
 	@echo -n "========== Convert ${CONVERT_FROM_ISO} to ${CONVERT_TO_ISO}"
