From bf7a7bdb1653b89ea2e1d80d3fa887267c33e79e Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Thu, 4 Apr 2013 16:30:52 +0200
Subject: copy_kernel to boot and size of initramfs/sqfs

---
 helper/fileutil.inc  |  4 ++--
 server/export_target | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/helper/fileutil.inc b/helper/fileutil.inc
index 76293bfb..8639aea0 100644
--- a/helper/fileutil.inc
+++ b/helper/fileutil.inc
@@ -115,7 +115,7 @@ generate_initramfs() {
         [ "x${PS[1]}" != "x0" ] && perror "cpio create failed."
         [ "x${PS[2]}" != "x0" ] && perror "gzip to '$3' failed."
         cd - &> /dev/null
-        pinfo "Created initramfs of $1 at $3. Size: $(du -bc "$3" | awk 'END {print $1}')"
+        pinfo "Created initramfs of $1 at $3. Size: $(du -bsh "$3" | awk 'END {print $1}')"
 }
 
 # generates squashfs of directory
@@ -126,5 +126,5 @@ generate_squashfs() {
 	[ -d "$1" ] || perror "$1 is not a directory."
 	mksquashfs "$1" "$2" -comp xz -b 1M -no-recovery >&6 \
 	        || perror "mksquashfs failed ($?)."
-	pinfo "Created squashfs of $1 at $2. Size: $(du -bc "$2" | awk 'END {print $1}')"
+	pinfo "Created squashfs of $1 at $2. Size: $(du -bsh "$2" | awk 'END {print $1}')"
 }
diff --git a/server/export_target b/server/export_target
index 4848fc09..e86e3d80 100755
--- a/server/export_target
+++ b/server/export_target
@@ -21,7 +21,6 @@ SERVER_BOOT_DIR="${MODE_DIR}/boot"
 
 #builds from remote server
 SERVER_BUILD_DIR="${MODE_DIR}/local_builds/${REMOTE_IP}"
-#REMOTE_BUILD_DIR="${MODE_DIR}/remote_builds"
 
 #stage32 sqfs directory 
 STAGE32_SQFS_DIR="${SERVER_BOOT_DIR}/stage32_sqfs/mnt"
@@ -41,6 +40,16 @@ initial_checks() {
 	[ ! -d "${SERVER_BOOT_DIR}" ] && mkdir -p "${SERVER_BOOT_DIR}"
 }
 
+copy_kernel() {
+	#copy kernel to boot directory
+	pinfo "Copying kernel from ${REMOTE_IP} to ${SERVER_BOOT_DIR}/kernel/"
+	if [ -d ${SERVER_BUILD_DIR}/kernel ]; then
+		cd ${SERVER_BUILD_DIR}
+		tarcopy kernel ${SERVER_BOOT_DIR}
+		cd - &> /dev/null
+	fi
+}
+
 sync_remote() {
 	[[ "${#SERVER_BUILD_DIR}" -lt "10" ]] && perror "Safety check failed: SERVER_BUILD_DIR is less than 10 chars. ($SERVER_BUILD_DIR)"
 	pinfo "Synching 'remote/builds' to 'server/remote_builds'..."
@@ -75,6 +84,7 @@ generate_addons() {
 export_target() {
 
 initial_checks
+copy_kernel
 
 TARGET=$1
 [ -d ${SERVER_BUILD_DIR}/${TARGET} ] || perror "Given target directory does not exist: ${SERVER_BUILD_DIR}/${TARGET}"
-- 
cgit v1.2.3-55-g7522