changeset 185:752079a08427

tidy up
author ray@terran.dlink.ua
date Tue, 02 Aug 2011 00:21:58 +0300
parents c4bf2a4a8768
children 8a06439ee514
files Makefile
diffstat 1 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Aug 02 00:20:41 2011 +0300
+++ b/Makefile	Tue Aug 02 00:21:58 2011 +0300
@@ -220,6 +220,10 @@
 
 WORLD_SUBDIRS+=include
 
+.for lib in ${WORLD_SUBDIRS_LIB}
+WORLD_SUBDIRS+=lib/${lib}
+.endfor
+
 .for dir in ${WORLD_SUBDIRS_BIN}
 WORLD_SUBDIRS+=bin/${dir}
 .endfor
@@ -228,10 +232,6 @@
 WORLD_SUBDIRS+=sbin/${dir}
 .endfor
 
-.for lib in ${WORLD_SUBDIRS_LIB}
-WORLD_SUBDIRS+=lib/${lib}
-.endfor
-
 .for dir in ${WORLD_SUBDIRS_USR_BIN}
 WORLD_SUBDIRS+=usr.bin/${dir}
 .endfor
@@ -582,10 +582,7 @@
 
 ${NEW_KERNEL}.bin.gz.sync:	${NEW_KERNEL}.bin.gz
 	@echo "++++++++++++++ Making [email protected] ++++++++++++++"
-	cp ${NEW_KERNEL}.bin.gz ${NEW_KERNEL}.bin.gz.sync
-	_SIZE=`stat -f %z ${NEW_KERNEL}.bin.gz.sync` ; \
-	_NEW_SIZE=$$(( (($${_SIZE} + 0xffff) & 0xffff0000) - 0x1c )) ; \
-	truncate -s $${_NEW_SIZE} ${NEW_KERNEL}.bin.gz.sync
+	dd if=${NEW_KERNEL}.bin.gz of=${NEW_KERNEL}.bin.gz.sync bs=64k conv=sync
 
 fwimage ${NEW_IMAGE}:  ${NEW_KERNEL}.bin.gz.sync ${NEW_ROOTFS}.iso.ulzma	${ZTOOLS_PATH}/asustrx
 	@echo "++++++++++++++ Making [email protected] ++++++++++++++"
@@ -602,10 +599,7 @@
 
 ${NEW_KERNEL}.${KERNEL_COMPRESSION_TYPE}.uboot.sync:	${NEW_KERNEL}.${KERNEL_COMPRESSION_TYPE}.uboot
 	@echo "++++++++++++++ Making [email protected] ++++++++++++++"
-	cp ${NEW_KERNEL}.${KERNEL_COMPRESSION_TYPE}.uboot ${NEW_KERNEL}.${KERNEL_COMPRESSION_TYPE}.uboot.sync
-	_SIZE=`stat -f %z ${NEW_KERNEL}.${KERNEL_COMPRESSION_TYPE}.uboot.sync` ; \
-	_NEW_SIZE=$$(( ($${_SIZE} + ${PACKING_KERNEL_ROUND}) & ~(${PACKING_KERNEL_ROUND} - 1) )) ; \
-	truncate -s $${_NEW_SIZE} ${NEW_KERNEL}.${KERNEL_COMPRESSION_TYPE}.uboot.sync
+	dd if=${NEW_KERNEL}.${KERNEL_COMPRESSION_TYPE}.uboot of=${NEW_KERNEL}.${KERNEL_COMPRESSION_TYPE}.uboot.sync bs=64k conv=sync
 
 # Howto
 # PACKING_KERNEL_ROUND=0x10000