diff options
| author | Simon Rettberg | 2023-08-11 11:06:43 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2023-08-11 11:06:43 +0200 |
| commit | c00877031ef5b2a8413be27de1f5224fa74af229 (patch) | |
| tree | daa73761fc972a4c1af6a309b58cb20d9331359b /core | |
| parent | fix shit (diff) | |
| download | mltk-c00877031ef5b2a8413be27de1f5224fa74af229.tar.gz mltk-c00877031ef5b2a8413be27de1f5224fa74af229.tar.xz mltk-c00877031ef5b2a8413be27de1f5224fa74af229.zip | |
This should never have worked
Diffstat (limited to 'core')
| -rwxr-xr-x | core/bin/setup_target | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/bin/setup_target b/core/bin/setup_target index df70412e..f09883f1 100755 --- a/core/bin/setup_target +++ b/core/bin/setup_target @@ -634,10 +634,10 @@ post_process_target() { local RSYNC_DEST RSYNC_EXCLUDE_LIST entry filelist target_file system_file # default dest and exclude list for non-addons RSYNC_DEST='/' - RSYNC_EXCLUDE_LIST="$( mktemp )" + RSYNC_EXCLUDE_LIST="$( mktemp "${ROOT_DIR}/tmp/${TARGET}${TARGET_VERSION}-rsync-install-XXXXX" )" # always exclude ld.so.cache, we handle that separately - echo 'etc/ld.so*' > "$RSYNC_EXCLUDE_LIST" - echo 'autoexec.bat' >> "$RSYNC_EXCLUDE_LIST" + echo '/etc/ld.so*' > "$RSYNC_EXCLUDE_LIST" + echo '/autoexec.bat' >> "$RSYNC_EXCLUDE_LIST" if [ -e "${TARGET_DIR}/.addon" ]; then # This is an addon, don't sync to / but to dedicated directory RSYNC_DEST="/opt/openslx/addons/${TARGET_BUILD_DIR##*/}" @@ -654,12 +654,12 @@ post_process_target() { if [ -L "$system_file" ] && [ -L "$target_file" ]; then # Two links with same destination? Skip [ "$( readlink "$system_file" )" == "$( readlink "$target_file" )" ] \ - && echo "$target_file" >> "$RSYNC_EXCLUDE_LIST" + && echo "$system_file" >> "$RSYNC_EXCLUDE_LIST" elif [ -L "$system_file" ] || [ -L "$target_file" ]; then : # One is link, the other isn't, do not skip elif cmp -s "$system_file" "$target_file"; then # Two files with same contents? Skip - echo "$target_file" >> "$RSYNC_EXCLUDE_LIST" + echo "$system_file" >> "$RSYNC_EXCLUDE_LIST" fi fi done |