summaryrefslogtreecommitdiffstats
path: root/remote/setup_target
diff options
context:
space:
mode:
authorSimon Rettberg2014-01-10 17:12:22 +0100
committerSimon Rettberg2014-01-10 17:12:22 +0100
commitcb109bc835cdfd1166e380a88caeb97013903eef (patch)
treec54f5d74807a8c67af790ec590d955ec1d93e9b4 /remote/setup_target
parent[pam-freiburg] cd to proper dir before launching AUTOSTART (diff)
downloadtm-scripts-cb109bc835cdfd1166e380a88caeb97013903eef.tar.gz
tm-scripts-cb109bc835cdfd1166e380a88caeb97013903eef.tar.xz
tm-scripts-cb109bc835cdfd1166e380a88caeb97013903eef.zip
<setup_target> Move package listing from module dir to target dir
Diffstat (limited to 'remote/setup_target')
-rwxr-xr-xremote/setup_target6
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"