Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update git to 2.40.1 and include contrib/subtree module #5702

Merged
merged 3 commits into from
Jun 1, 2023

Conversation

Fisiu
Copy link
Contributor

@Fisiu Fisiu commented Apr 20, 2023

Description

Fixes #

Checklist

  • Build rule all-supported completed successfully
  • New installation of package completed successfully
  • Package upgrade completed successfully (Manually install the package again)
  • Package functionality was tested
  • Any needed documentation is updated/created

Type of change

  • Bug fix
  • New Package
  • Package update
  • Includes small framework changes
  • This change requires a documentation update (e.g. Wiki)

Signed-off-by: Mariusz Fik <mariusz@fidano.pl>
@hgy59
Copy link
Contributor

hgy59 commented May 17, 2023

@Fisiu is it possible to update git to v2.40.1?
And probably we can add git subtree as requested in #5726?

@Fisiu
Copy link
Contributor Author

Fisiu commented May 17, 2023

git bumped to 2.40.1, subtree included. Not sure if there is macro for make however @$(RUN) make works fine.

@Fisiu Fisiu changed the title Update git to 2.40.0. Update git to 2.40.1 and include contrib/subtree module May 17, 2023
cross/git/Makefile Outdated Show resolved Hide resolved
cross/git/Makefile Outdated Show resolved Hide resolved
spk/git/Makefile Outdated Show resolved Hide resolved
Signed-off-by: Mariusz Fik <mariusz@fidano.pl>
@Fisiu
Copy link
Contributor Author

Fisiu commented May 18, 2023

@hgy59, thanks for suggestions - all applied.

@hgy59
Copy link
Contributor

hgy59 commented May 18, 2023

@Fisiu I have two more suggestions


There are some non-stripped binaries in the libexec/git-core/ folder. By adding the following lines to cross/git/PLIST, we can strip those and reduce the package size a little bit:

bin:libexec/git-core/git
bin:libexec/git-core/git-daemon
bin:libexec/git-core/git-http-backend
bin:libexec/git-core/git-http-fetch
bin:libexec/git-core/git-http-push
bin:libexec/git-core/git-imap-send
bin:libexec/git-core/git-remote-http
bin:libexec/git-core/git-sh-i18n--envsubst
bin:libexec/git-core/git-shell
bin:libexec/git-core/scalar

Another suggestion is to use hardlinks and remove the NO_INSTALL_HARDLINKS=1 option from the INSTALL_MAKE_OPTIONS. (i.e. to remove the declaration of INSTALL_MAKE_OPTIONS in cross/git/Makefile at all, as the remaining value is the default).
And to remove the patch 001-git-less-hardlinks.patch.
With hardlinks some binary files are installed as links and this shrinks the package size by about 15%.
I have tested git with hardlinks on DSM 6 and 7 and cannot find any issues. But I have no clue why the option to disable hardlinks was added to the early git package (at least since version 1.8.1.5 on 11.03.2013).
This suggestion is not fully approved (and I will have to test it with DSM 5.2 too).
What do you think about this?

@Fisiu
Copy link
Contributor Author

Fisiu commented May 23, 2023

@hgy59
Changes applied. Indeed, spk file size has been reduced by few MB. I did some initial testing on DSM 7.1 and spk with hardlinks seems to be working as intended.

cross/git/PLIST Outdated
rsc:libexec/git-core/
rsc:share/git-core/
rsc:share/gitweb/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Fisiu is there any benefit of including gitweb in the package?

We intentionally removed this in #5035. It was required by our git-server package that is not maintained for a long time.
As we have a gitea package and Synology provides a git-server package, there is no reason to keep this piece of code in the package.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied one line to much from generated PLIST. Should be good now.

Signed-off-by: Mariusz Fik <mariusz@fidano.pl>
@hgy59 hgy59 merged commit e47525e into SynoCommunity:master Jun 1, 2023
@hgy59 hgy59 added the status/published Published and activated (may take up to 48h until visible in DSM package manager) label Jun 1, 2023
@Fisiu Fisiu deleted the git-update branch June 5, 2023 20:44
@hgy59 hgy59 mentioned this pull request Dec 28, 2023
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/published Published and activated (may take up to 48h until visible in DSM package manager)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants