diff options
Diffstat (limited to 'external')
-rw-r--r-- | external/onlineupdate/UnpackedTarball_onlineupdate.mk | 1 | ||||
-rw-r--r-- | external/onlineupdate/inifiles.patch | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/onlineupdate/UnpackedTarball_onlineupdate.mk b/external/onlineupdate/UnpackedTarball_onlineupdate.mk index 166ede0a6b9b..43c189b84a18 100644 --- a/external/onlineupdate/UnpackedTarball_onlineupdate.mk +++ b/external/onlineupdate/UnpackedTarball_onlineupdate.mk @@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,onlineupdate, \ ifeq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_patches,onlineupdate, \ external/onlineupdate/cygpath.patch \ + external/onlineupdate/inifiles.patch \ )) endif diff --git a/external/onlineupdate/inifiles.patch b/external/onlineupdate/inifiles.patch new file mode 100644 index 000000000000..1d285f09af1b --- /dev/null +++ b/external/onlineupdate/inifiles.patch @@ -0,0 +1,11 @@ +--- tools/update-packaging/make_incremental_update.sh ++++ tools/update-packaging/make_incremental_update.sh +@@ -226,7 +227,7 @@ + patchsize=$(get_file_size "$patchfile") + fullsize=$(get_file_size "$workdir/$f") + +- if [ $patchsize -lt $fullsize ]; then ++ if [ $patchsize -lt $fullsize ] && [ "$f" != program/setup.ini ] && [ "$f" != program/version.ini ]; then + make_patch_instruction "$f" "$updatemanifestv3" + mv -f "$patchfile" "$workdir/$f.patch" + rm -f "$workdir/$f" |