diff options
| author | Michael Neves | 2013-04-24 18:19:49 +0200 |
|---|---|---|
| committer | Michael Neves | 2013-04-24 18:19:49 +0200 |
| commit | 97472f07e21c73e9d767de7960dc1e05ba48b53d (patch) | |
| tree | e4119718dbddd68664480436767fc12d4a319700 /remote/setup_target | |
| parent | fix rsyslog (diff) | |
| parent | We will require wpad for the future ... (diff) | |
| download | tm-scripts-97472f07e21c73e9d767de7960dc1e05ba48b53d.tar.gz tm-scripts-97472f07e21c73e9d767de7960dc1e05ba48b53d.tar.xz tm-scripts-97472f07e21c73e9d767de7960dc1e05ba48b53d.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/setup_target')
| -rwxr-xr-x | remote/setup_target | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/remote/setup_target b/remote/setup_target index 1f4840b8..43765ce3 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -3,8 +3,6 @@ MODE_DIR="${ROOT_DIR}/remote" MODULES_DIR="${MODE_DIR}/modules" -KERNEL_DIR="${MODE_DIR}/builds/kernel" - # Keep track of processed modules PROCESSED_MODULES="" @@ -136,7 +134,7 @@ copy_files_with_deps () { generate_target() { initial_checks - copy_kernel + #copy_kernel TARGET=$1 && shift TARGET_DIR="${MODE_DIR}/targets/${TARGET}" @@ -218,8 +216,8 @@ process_module() { pinfo "## Building" [ -e "${MODULE_DIR}/.built" ] || { build && touch "${MODULE_DIR}/.built"; } # remove *.la files as they might confuse libtool/linker of other tool packages - find "${MODULE_BUILD_DIR}" -name '*.la' -exec rm -f {} \; - [ -d "$TARGET_BUILD_DIR" ] && TARGET_BUILD_SIZE=$(du -bc "${TARGET_BUILD_DIR}" | awk 'END {print $1}') || TARGET_BUILD_SIZE=0 + [ -d "${MODULE_BUILD_DIR}" ] && find "${MODULE_BUILD_DIR}" -name '*.la' -exec rm -f {} \; + [ -d "${TARGET_BUILD_DIR}" ] && TARGET_BUILD_SIZE=$(du -bc "${TARGET_BUILD_DIR}" | awk 'END {print $1}') || TARGET_BUILD_SIZE=0 pinfo "## Copying files with dependencies" copy_files_with_deps pinfo "## Copying static module files" @@ -243,7 +241,7 @@ local TOOL_STR="$TOOL_STR post_process_target:" #move systemd files from /lib to /etc/lib pinfo "move systemd files from /lib/systemd to /etc/systemd" -if [ -d "${TARGET_BUILD_DIR}/lib" ]; then +if [ -d "${TARGET_BUILD_DIR}/lib/systemd" ]; then cd "${TARGET_BUILD_DIR}/lib" tarcopy "systemd" "${TARGET_BUILD_DIR}/etc" cd - &> /dev/null |