diff options
| author | Simon Rettberg | 2014-01-13 14:11:28 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-01-13 14:11:28 +0100 |
| commit | f853dc0f548ba86181e2c2682629b4d51d302efd (patch) | |
| tree | acf120952c8a3cdd28f07080e4da18657ead62a5 /remote/setup_target | |
| parent | [vmchooser] Refining iptables MASQUERADE rule to work around an issue where i... (diff) | |
| parent | update cups to work with ubuntu 13.10 (diff) | |
| download | tm-scripts-f853dc0f548ba86181e2c2682629b4d51d302efd.tar.gz tm-scripts-f853dc0f548ba86181e2c2682629b4d51d302efd.tar.xz tm-scripts-f853dc0f548ba86181e2c2682629b4d51d302efd.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/setup_target')
| -rwxr-xr-x | remote/setup_target | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remote/setup_target b/remote/setup_target index 1fd059fc..5fc68a4f 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -134,8 +134,8 @@ copy_files_with_deps () { [ ! -d "$MODULE_BUILD_DIR" ] && pinfo "No build directory found, skipping dependency copying" && return 0 cd "$MODULE_BUILD_DIR" - local COPYFILES_LIST="$MODULE_BUILD_DIR/copy_files_with_deps.filelist" - [ -e "${COPYFILES_LIST}" ] && rm "${COPYFILES_LIST}" + local COPYFILES_LIST="${TARGET_BUILD_DIR}/opt/openslx/.mltk/${MODULE}.copy_files_with_deps" + rm -f -- "${COPYFILES_LIST}" # from REQUIRED_BINARIES - follow symlinks and ldd the file [ ! -z "${REQUIRED_BINARIES}" ] && pinfo "Gathering required binaries from config file..." @@ -503,7 +503,7 @@ clean_module() { rm -rf -- "${MODULE_DIR}/src" || perror "Could not delete src path" rm -f -- "${MODULE_DIR}/list_dpkg_output" || perror "Could not delete list_dpkg_output" rm -f -- "${MODULE_DIR}/list_binaries_and_files" || perror "Could not delete list_binaries_and_files" - rm -f -- "${TARGET_BUILD_DIR}/opt/openslx/.mltk/${MODULE}.md5" + rm -f -- "${TARGET_BUILD_DIR}/opt/openslx/.mltk/${MODULE}."* # no space here! # These are not in use anymore, but leave the cleanup here for upgraders rm -f -- "${MODULE_DIR}/.built" rm -f -- "${MODULE_DIR}/.fetched_source" |