diff options
| author | Simon Rettberg | 2013-04-24 20:11:51 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-04-24 20:11:51 +0200 |
| commit | 3ea8042163cdd191db1237ede4cbb06f497c9fdc (patch) | |
| tree | 71293396ef12f3fd2ddd4cf57335f710498c4fda /remote/setup_target | |
| parent | several suse fixes (login etc) (diff) | |
| parent | fix rsyslogd for ubuntu (hopefully not broken on suse :/) (diff) | |
| download | tm-scripts-3ea8042163cdd191db1237ede4cbb06f497c9fdc.tar.gz tm-scripts-3ea8042163cdd191db1237ede4cbb06f497c9fdc.tar.xz tm-scripts-3ea8042163cdd191db1237ede4cbb06f497c9fdc.zip | |
Super duper merge
Diffstat (limited to 'remote/setup_target')
| -rwxr-xr-x | remote/setup_target | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/remote/setup_target b/remote/setup_target index 992390a9..15938558 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -220,6 +220,8 @@ process_module() { [ -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 required system files" + copy_system_files pinfo "## Copying static module files" copy_static_data pinfo "## Post copy" @@ -236,28 +238,29 @@ process_module() { post_process_target() { -local TOOL_STR="$TOOL_STR post_process_target:" + 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" + #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 - cd "${TARGET_BUILD_DIR}/lib" - tarcopy "systemd" "${TARGET_BUILD_DIR}/etc" - cd - &> /dev/null - rm -r "${TARGET_BUILD_DIR}/lib/systemd" -fi + if [ -d "${TARGET_BUILD_DIR}/lib/systemd" ]; then + cd "${TARGET_BUILD_DIR}/lib" + tarcopy "systemd" "${TARGET_BUILD_DIR}/etc" + cd - &> /dev/null + rm -r "${TARGET_BUILD_DIR}/lib/systemd" + fi } clean_modules() { TARGET=$1 + shift TARGET_DIR="${MODE_DIR}/targets/${TARGET}" TARGET_BUILD_DIR="${MODE_DIR}/builds/${TARGET}" [ -d $TARGET_DIR ] || perror "Given target directory does not exist: $TARGET_DIR" - if [ "x$2" = "x" -o "x$2" = "xall" ]; then + if [ "x$1" = "x" -o "x$1" = "xall" ]; then if [ -e ${ROOT_DIR}/logs/${TARGET}.size ]; then rm "${ROOT_DIR}/logs/${TARGET}.size" || perror "Could not delete logs/${TARGET}.size" fi |