[Zrouter-src] ZRouter.org: push to ZRouter Makefile

[zrouter-src at zrouter.org]

details:   http://zrouter.org/hg/zrouter//rev/1df90b4e4716
changeset: 254:1df90b4e4716
user:      ray at terran.dlink.ua
date:      Fri Dec 09 02:02:06 2011 +0200
description:
fix trx build

diffstat:

 Makefile |  21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diffs (38 lines):

diff -r 4bf57f9c776e -r 1df90b4e4716 Makefile
--- a/Makefile	Fri Dec 09 00:53:41 2011 +0200
+++ b/Makefile	Fri Dec 09 02:02:06 2011 +0200
@@ -515,23 +515,24 @@
 
 ZROUTER_VERSION?=0.1-ALPHA
 
-PACKING_TARGET_LIST:=${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_${PACKING_KERNEL_IMAGE} \
-    ${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_${PACKING_ROOTFS_IMAGE}
+KERNEL_PACKED_NAME=${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_${PACKING_KERNEL_IMAGE}
+ROOTFS_PACKED_NAME=${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_${PACKING_ROOTFS_IMAGE}
+
+PACKING_TARGET_LIST:=${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME}
 .warning "PACKING_KERNEL_IMAGE=${PACKING_TARGET_LIST}"
 .include "share/mk/zrouter.packing.mk"
 
-
-
-
-fwimage ${NEW_IMAGE}:  ${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_${PACKING_KERNEL_IMAGE} ${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_${PACKING_ROOTFS_IMAGE}	${ZTOOLS_PATH}/asustrx
+#
+# TODO: comment here
+#
+fwimage ${NEW_IMAGE}:  ${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME}	${ZTOOLS_PATH}/asustrx
 	@echo "++++++++++++++ Making $@ ++++++++++++++"
-	PATH=${IMAGE_BUILD_PATHS} asustrx -o ${NEW_IMAGE} ${PACKING_KERNEL_IMAGE} ${PACKING_ROOTFS_IMAGE}
+	PATH=${IMAGE_BUILD_PATHS} asustrx -o ${NEW_IMAGE} ${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME}
 
 # zimage used when it possible to use any formats (CFI devices must use trx 
 # format, but U-Boot devices must use only kernel in U-Boot format )
-
-zimage:		${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_${PACKING_KERNEL_IMAGE} ${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_${PACKING_ROOTFS_IMAGE}
-	cat ${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_${PACKING_KERNEL_IMAGE} ${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_${PACKING_ROOTFS_IMAGE} > ${NEW_IMAGE}
+zimage:		${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME}
+	cat ${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME} > ${NEW_IMAGE}
 	IMGMD5=`md5 ${NEW_IMAGE} | cut -f4 -d' '` ; \
 	cp ${NEW_IMAGE} ${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}-${ZROUTER_VERSION}.$${IMGMD5}.${IMAGE_SUFFIX}