Le Thu, Apr 20, 2023 at 01:36:48PM +0200, Stefan Sperling a écrit : > On Thu, Apr 20, 2023 at 07:14:39AM +0200, Landry Breuil wrote: > > Le Wed, Apr 19, 2023 at 11:56:21PM +0200, Stefan Sperling a écrit : > > > A new release of got introduces gitwrapper which makes it much > > > easier to run gotd side-by-side with regular Git binaries. > > > Essentially, clients fetching repositories over ssh will be talking to > > > gotd if the repository is listed in /etc/gotd.conf. Otherwise they > > > will be talking to regular Git. (Unless the user account has gotsh > > > set as login shell, which will always talk to gotd.) > > > > > > For this to work, gitwrapper must replace two specific binaries in > > > the git package with symlinks to itself. I am trying to make this > > > work seemlessly during upgrades from got-0.86 and git-2.40.0. > > > > > > When I install the git package from the ports tree with: > > > make install SUDO=doas > > > this does not install the gitwrapper package from devel/got and the > > > files end up missing from disk. Can anyone tell what am I doing wrong? > > > I would hope the RUN_DEPENDS I've added would take care of this? > > > > I think the RDEP should be devel/got,-gitwrapper to install the > > -gitwrapper subpackage, devel/got,gitwrapper asks for the gitwrapper > > FLAVOR of the got port (which doesnt exist) > > Ah, thanks! I missed that difference. > > And I need to add gitwrapper to RUN_DEPENDS-main instead of RUN_DEPENDS. > > I am now adding gitwrapper as a run-dep for gotd as well. > > This gets me further but 'make install' and 'make upgrade' fail, > even though gitwrapper is built as a package locally. > > Is this supposed to work?
yes it is but for complicated cases "make update" cant work iirc. You need to update both packages (gitwrapper and git) altogether for it to work. have you tried pointing pkg_add -u at /usr/ports/packages/amd64/all via TRUSTED_PKG_PATH (dont remember the exact magic) Landry
