Skip to content

Pick up stat analysis patches made for 23.12 and 2.11.0

Dmitry Rodionov requested to merge dkr/port-existing-stat-analysis-patches into master

Summary

This patch combines patches from these two picodata/tarantool fork branches: https://git.picodata.io/picodata/tarantool/-/tree/dynamic-linking-from-system?ref_type=heads https://git.picodata.io/picodata/picodata/picodata/-/tree/svace-fixes?ref_type=heads

Previously patches for tarantool were made for 2.11.0 so for 2.11.2 (version we currently use) some of them had to be updated.

Patches from b124e8f01fafb98bc3005f77b8852d1f699f8666 initially were committed to fork repo but for manageability it was decided that its easier to support those via patch files. So these changes are added to existing patches in certification_patches dir.

Then follow changes from 6b851b86 and 2be2aab5. Patch application is currently concentrated in gitlab-ci.yml. 6b851b moved svace patches application to tarantool's makefile. For now its easier to keep it in one place. Svace patches from previous commit are moved into subdirectory. Patches that touch supplementary files or simply remove them are removed and the list of the files is kept for later to form a dedicated list of files for deletion.

Conflicting were picked from f98334ea. Redundant patch for curl libssh was removed because the same change appeared upstream https://github.com/curl/curl/pull/11088/files

Luagdb patch was updated. OSCP response patch as well as icu_common_exec patch were removed, since original files are no longer in the repo.

Lastly patch application is moved to dedicated python script for ease of sharing with vm builder repo.

Co-authored-by: Feodor Alexandrov feodor.alex.alexandrov@gmail.com

  • Close #...
  • Target branch: master
  • Docs follow-up: not necessary / new issue
Edited by Dmitry Rodionov

Merge request reports