diff options
| author | Manuel Schneider | 2014-07-10 15:33:59 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-07-10 15:33:59 +0200 |
| commit | 25d12b5fa6c1dd0db265da0e63c7b5a5333c5093 (patch) | |
| tree | 9d5b842fdd032e69426f65777de46079b9f0866a /remote/setup_target | |
| parent | [pvs2] Adjusted module.build to build in /opt/openslx/bin (diff) | |
| parent | Add option REQUIRED_ORIGINAL_USR_SPLIT to disable symlinking /bin to /usr/bin... (diff) | |
| download | tm-scripts-25d12b5fa6c1dd0db265da0e63c7b5a5333c5093.tar.gz tm-scripts-25d12b5fa6c1dd0db265da0e63c7b5a5333c5093.tar.xz tm-scripts-25d12b5fa6c1dd0db265da0e63c7b5a5333c5093.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/setup_target')
| -rwxr-xr-x | remote/setup_target | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/remote/setup_target b/remote/setup_target index 11e1d5be..bc269ca9 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -370,11 +370,13 @@ process_module() { fi # Process module mkdir -p "${MODULE_BUILD_DIR}" || perror "Could not create build dir" - local DIR - for DIR in lib lib64 bin sbin; do - mkdir -p "${MODULE_BUILD_DIR}/usr/${DIR}" || perror "Could not create '${MODULE_BUILD_DIR}/usr/${DIR}'" - [ -L "${MODULE_BUILD_DIR}/${DIR}" ] || ln -s "usr/${DIR}" "${MODULE_BUILD_DIR}/${DIR}" || perror "Could not symlink '${MODULE_BUILD_DIR}/${DIR}' to 'usr/${DIR}" - done + if [ -z "${REQUIRED_ORIGINAL_USR_SPLIT}" -o "x${REQUIRED_ORIGINAL_USR_SPLIT}" = "xno" ]; then + local DIR + for DIR in lib lib64 bin sbin; do + mkdir -p "${MODULE_BUILD_DIR}/usr/${DIR}" || perror "Could not create '${MODULE_BUILD_DIR}/usr/${DIR}'" + [ -L "${MODULE_BUILD_DIR}/${DIR}" ] || ln -s "usr/${DIR}" "${MODULE_BUILD_DIR}/${DIR}" || perror "Could not symlink '${MODULE_BUILD_DIR}/${DIR}' to 'usr/${DIR}" + done + fi pdebug "## Reading config of $MODULE" read_config # Check if this module has a dependency that wasn't built yet: |