diff options
| author | Jonathan Bauer | 2016-12-23 13:12:09 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2016-12-23 13:12:09 +0100 |
| commit | 6806ae4a850fc7785a8c05304237cf53b5b8f951 (patch) | |
| tree | b1dd8413d6c7b9a250251da7f0d49bb52b4ddc57 /core/bin | |
| parent | wrong kernel version variable used (diff) | |
| download | mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.gz mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.xz mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.zip | |
merge with latest dev version (tm-scripts commit f5a59daf8d70a9027118292cd40b18c221897408)
Diffstat (limited to 'core/bin')
| -rwxr-xr-x | core/bin/setup_target | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/bin/setup_target b/core/bin/setup_target index 865cf22d..f8f90801 100755 --- a/core/bin/setup_target +++ b/core/bin/setup_target @@ -375,7 +375,7 @@ process_module() { 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}" + perror "Module directory for '$MODULE' not found in ${TARGET_DIR}" fi perror "Module directory for '$MODULE' not found in ${TARGET_DIR} (is a dependency of${DEPOF})" return @@ -435,7 +435,7 @@ process_module() { get_kernel_version # Execute load-hook before anything else module_load - cd "${MODULE_WORK_DIR}" || perror "cd to '${MODULE_WORK_DIR}' failed." + cd "${MODULE_WORK_DIR}" || perror "cd to '${MODULE_WORK_DIR}' failed." # Fetch source code if [ ! -e "$SOURCE_FLAG" ]; then pinfo "## Fetching source" @@ -498,7 +498,9 @@ clean_modules() { TARGET=$1 shift - TARGET_DIR="$(target_path ${TARGET})" + # TODO: what was the idea of target path? presumably something to do with the 'overlays' folder? + #TARGET_DIR="$(target_path ${TARGET})" + TARGET_DIR="${CORE_DIR}/targets/${TARGET}" TARGET_BUILD_DIR="${ROOT_DIR}/var/builds/${TARGET}" [ -d $TARGET_DIR ] || perror "Given target directory does not exist: $TARGET_DIR" |