1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-12 18:11:03 +02:00

doc: Minor speedo build clarification

--

Using the given command line for installation is almost always good,
so don't confuse the user with the first sentence.  Also explain how
to disable systemd for keyboxd and dirmngr.
This commit is contained in:
Werner Koch 2025-05-28 10:36:09 +02:00
parent 018a2289ba
commit e8eb92019f
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 10 additions and 6 deletions

10
README
View File

@ -90,7 +90,11 @@
toolchain is installed. On a Debian based system it should be toolchain is installed. On a Debian based system it should be
sufficient to run as root: sufficient to run as root:
apt-get install build-essential libusb-1.0-0-dev libsqlite3-dev patchelf apt-get install build-essential libusb-1.0-0-dev libsqlite3-dev \
libldap-dev libreadline-dev patchelf
(libldap-dev and libreadline-dev are not strictly necessary but
are highly suggested.)
Then as regular user run Then as regular user run
@ -229,8 +233,8 @@
systemctl --user mask --now gpg-agent.service \ systemctl --user mask --now gpg-agent.service \
gpg-agent.socket gpg-agent-ssh.socket \ gpg-agent.socket gpg-agent-ssh.socket \
gpg-agent-extra.socket gpg-agent-browser.socket gpg-agent-extra.socket gpg-agent-browser.socket
systemctl --user mask --now dirmngr.socket systemctl --user mask --now dirmngr.service dirmngr.socket
systemctl --user mask --now keyboxd.socket systemctl --user mask --now keyboxd.service keyboxd.socket
This way all GnuPG components can handle the startup of their This way all GnuPG components can handle the startup of their
daemons on their own and start the correct version. daemons on their own and start the correct version.

View File

@ -1110,10 +1110,10 @@ ifneq ($(TARGETOS),w32)
echo "sysconfdir = /etc/gnupg" >bin/gpgconf.ctl ;\ echo "sysconfdir = /etc/gnupg" >bin/gpgconf.ctl ;\
echo "rootdir = $(idir)" >>bin/gpgconf.ctl ;\ echo "rootdir = $(idir)" >>bin/gpgconf.ctl ;\
echo "speedo: /*" ;\ echo "speedo: /*" ;\
echo "speedo: * Now copy $(idir)/ to the final location and" ;\ echo "speedo: * Now run for example:" ;\
echo "speedo: * adjust $(idir)/bin/gpgconf.ctl accordingly" ;\
echo "speedo: * Or run run for example:" ;\
echo "speedo: * make -f $(topsrc)/build-aux/speedo.mk install SYSROOT=/usr/local/gnupg26" ;\ echo "speedo: * make -f $(topsrc)/build-aux/speedo.mk install SYSROOT=/usr/local/gnupg26" ;\
echo "speedo: * This copies copy $(idir)/ to the final location and" ;\
echo "speedo: * adjusts $(idir)/bin/gpgconf.ctl accordingly" ;\
echo "speedo: */") echo "speedo: */")
endif endif