From 97b4ba82596ae5484079483afeaba7986958ecab Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Wed, 20 Mar 2013 15:22:51 +0100
Subject: KERNEL_VERSION from system.inc

gitignore and calc_size in fileutil calculates the build size of a module

fix generate_target argument parsing

add xfs to rootfs-stage31.conf

added server sync option -s

- Fix sshd module failing to set permissions on sshd config
- Add all required packages for openSUSE to xorg module
- Softlink sh to bash in rootfs-stage32, as some scripts might fail otherwise

Thanks hwinfo but we don't need you anymore

Added size log

fix list_packet_files exiting loop when a packet wasnt installed

remove flag checks, now done in setup_target

check if kernel module is already built-in
---
 server/export_target | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'server')

diff --git a/server/export_target b/server/export_target
index cb55a55f..587804d9 100755
--- a/server/export_target
+++ b/server/export_target
@@ -32,19 +32,24 @@ initial_checks() {
 	local TOOL_STR="$TOOL_STR initial_checks:"
 
 	#check for required tools
-        for BIN in squashfs-tools
+        for BIN in mksquashfs
         do
                 local TEST=$(which ${BIN})
                 [ -z "${TEST}" ] && pinfo "Installing ${BIN}..." && apt-get install ${BIN}
         done
 
-	#setup link to remote build directory, later this directory will be rsynced or exported to this server...
+	[ ! -d "${SERVER_BOOT_DIR}" ] && mkdir -p "${SERVER_BOOT_DIR}"
+}
+
+sync_remote() {
+
+	pinfo "Synching 'remote/builds' to 'server/remote_builds'..."
+	#TODO setup link to remote build directory, later this directory will be rsynced or exported to this server...
 	if [ ! -d "${SERVER_BUILD_DIR}" ]; then
-		[ ! -d "${REMOTE_BUILD_DIR}" ] && perror "remote 'builds' directory not foud, exiting."		
+		[ ! -d "${REMOTE_BUILD_DIR}" ] && perror "remote 'builds' directory not found, exiting."		
 		ln -s "${REMOTE_BUILD_DIR}" "${SERVER_BUILD_DIR}"
 	fi
 
-	[ ! -d "${SERVER_BOOT_DIR}" ] && mkdir -p "${SERVER_BOOT_DIR}"
 }
 
 generate_stage32() {
@@ -58,7 +63,7 @@ generate_stage32() {
 
 generate_stage31() {
 	local TOOL_STR="${TOOL_STR} generate_stage31:"
-	pinfo "Writing 'initramfs-${BUILD}' to '${SERVER_BOOT_DIR}'"
+	pinfo "Writing 'initramfs-${TARGET}' to '${SERVER_BOOT_DIR}'"
 	generate_initramfs "${SERVER_BUILD_DIR}/${TARGET}" "." "${SERVER_BOOT_DIR}/initramfs-${TARGET}" 
 }
 
@@ -103,6 +108,6 @@ clean_target() {
 	pinfo "Cleaning '${SERVER_BOOT_DIR}/${TARGET}.sqfs'..."
 	[ -e "${SERVER_BOOT_DIR}/${TARGET}.sqfs" ] && { rm "${SERVER_BOOT_DIR}/${TARGET}.sqfs" || perror "rm failed."; }
 	pinfo "Cleaning '${SERVER_BOOT_DIR}/stage32_dqfs/mnt/${TARGET}.sqfs'..."
-	[ -e "${SERVER_BOOT_DIR}/stage32_dqfs/mnt/${TARGET}.sqfs" ] && { rm "${SERVER_BOOT_DIR}/stage32_dqfs/mnt/${TARGET}.sqfs" || perror "rm failed."; }
+	[ -e "${SERVER_BOOT_DIR}/stage32_sqfs/mnt/${TARGET}.sqfs" ] && { rm "${SERVER_BOOT_DIR}/stage32_sqfs/mnt/${TARGET}.sqfs" || perror "rm failed."; }
 }
 
-- 
cgit v1.2.3-55-g7522