diff options
| author | Simon Rettberg | 2014-01-03 16:02:02 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-01-03 16:02:02 +0100 |
| commit | 215af57497faaef0c7f154ea7c8376837f17b186 (patch) | |
| tree | 0404b736ecc368999606c8f74bf2f3d4d3873f5e | |
| parent | [kdm] Move bwlehrpool theme to its own module, kdm-theme-bwlp, (diff) | |
| download | tm-scripts-215af57497faaef0c7f154ea7c8376837f17b186.tar.gz tm-scripts-215af57497faaef0c7f154ea7c8376837f17b186.tar.xz tm-scripts-215af57497faaef0c7f154ea7c8376837f17b186.zip | |
Put module md5 files in target's build dir so we don't mess up when several targets contain the same modules
| -rwxr-xr-x | remote/setup_target | 3 | ||||
| -rwxr-xr-x | server/export_target | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/remote/setup_target b/remote/setup_target index 1d5fb921..9b9e0f44 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -335,7 +335,8 @@ process_module() { local TOOL_STR="[${MODULE}]" local SOURCE_FLAG="$MODULE_BUILD_DIR/fetched_source.flag" local BUILD_FLAG="$MODULE_BUILD_DIR/build_complete.flag" - local MD5FILE="$MODULE_BUILD_DIR/module_checksum.md5" + local MD5FILE="${TARGET_BUILD_DIR}/opt/openslx/.mltk/${MODULE}.md5" + mkdir -p "${TARGET_BUILD_DIR}/opt/openslx/.mltk" if [ ! -d "${MODULE_DIR}" ]; then if [ -z "$DEPOF" ]; then perror "Module directory for '$MODULE' not found in ${TAREGET_DIR}" diff --git a/server/export_target b/server/export_target index c5fae7f4..270e6fcf 100755 --- a/server/export_target +++ b/server/export_target @@ -50,7 +50,7 @@ sync_remote() { #TODO setup link to remote build directory, later this directory will be rsynced or exported to this server... mkdir -p "${SERVER_BUILD_DIR}" || perror "Could not create directory for local copy of remote system ($SERVER_BUILD_DIR)" - rsync -a --numeric-ids --delete -v -e "ssh -c arcfour -oStrictHostKeyChecking=no" "root@$REMOTE_IP:/export/build/*" "$SERVER_BUILD_DIR" + rsync -a --numeric-ids --exclude '/opt/openslx/.mltk' --delete --delete-excluded -v -e "ssh -c arcfour -oStrictHostKeyChecking=no" "root@$REMOTE_IP:/export/build/*" "$SERVER_BUILD_DIR" local RET=$? if [ $RET -eq 0 ]; then pinfo "Syncing completed." |