diff options
| author | Simon Rettberg | 2013-05-14 16:41:56 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-05-14 16:41:56 +0200 |
| commit | 113ce521770232a6d99cdb07dd55d8879214c213 (patch) | |
| tree | c1233152bfb18b8bd427cf3a1178900bfd768d8c /remote/setup_target | |
| parent | ultrastracke 2 (diff) | |
| parent | ultrastracke update (diff) | |
| download | tm-scripts-113ce521770232a6d99cdb07dd55d8879214c213.tar.gz tm-scripts-113ce521770232a6d99cdb07dd55d8879214c213.tar.xz tm-scripts-113ce521770232a6d99cdb07dd55d8879214c213.zip | |
Merge branch 'master' of openslx: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 924450fd..10d6b575 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -213,11 +213,11 @@ process_module() { install_dependencies pinfo "## Fetching source" [ -e "${MODULE_DIR}/.fetched_source" ] || { fetch_source && touch "${MODULE_DIR}/.fetched_source"; } - if [ -e "${MODULE_DIR}/.built" -a -d "${MODULE_DIR}/build" ]; then + if [ -e "${MODULE_DIR}/.built" -a -d "${MODULE_BUILD_DIR}" ]; then pinfo "# built-flag is set, skipping build..." else pinfo "## Building" - mkdir -p "${MODULE_DIR}/build" || perror "Could not create build dir" + mkdir -p "${MODULE_BUILD_DIR}" || perror "Could not create build dir" build # calls perror if something fails, no need to do that here touch "${MODULE_DIR}/.built" || pwarning "Error setting built-flag" fi @@ -275,7 +275,7 @@ clean_modules() { && rm -rf "${TARGET_BUILD_DIR}"/* \ || perror "Error deleting $TARGET_BUILD_DIR" fi - set -- $(ls ${TARGET_DIR}) + set -- $(ls ${TARGET_DIR} | grep -v kernel) fi cd ${TARGET_DIR} while (( "$#" )); do |