package/openvpn: adds target install of systemd unit files
PATCH 1/1 package/openvpn: adds target install of systemd unit files
From: Edmundo Ferreira <[email protected]>
--- package/openvpn/openvpn.mk | 8 ++++++++ 1 file changed, 8 insertions(+)
package/openvpn/openvpn.mk +8 -0
@@ -79,4 +79,12 @@ define OPENVPN_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S60openvpn endef +define OPENVPN_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/distro/systemd/openvpn-client at .service \ + $(TARGET_DIR)/usr/lib/systemd/system/openvpn-client at .service + + $(INSTALL) -D -m 0644 $(@D)/distro/systemd/openvpn-server at .service \ + $(TARGET_DIR)/usr/lib/systemd/system/openvpn-server at .service +endef + $(eval $(autotools-package))
Signature · 1 line
2.17.1
PATCH 1/1 package/openvpn: adds target install of systemd unit files
Quoted 6 lines · On Tue, 15 Dec 2020 17:36:10 +0100 Edmundo Ferreira <[email protected]>…
From: Edmundo Ferreira <[email protected]>
Signed-off-by Edmundo Ferreira <[email protected]>--- package/openvpn/openvpn.mk | 8 ++++++++ 1 file changed, 8 insertions(+)
Hum, I've applied, but reading again distro/systemd/Makefile.am, it seems like manually copying those files is not needed. If you pass --enable-systemd, which we already do when BR2_PACKAGE_SYSTEMD=y. Isn't that working ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/openvpn: adds target install of systemd unit files
Quoted 4 lines · On Thu, 31 Dec 2020 15:43:32 +0100 Thomas Petazzoni…
Hum, I've applied, but reading again distro/systemd/Makefile.am, it seems like manually copying those files is not needed. If you pass --enable-systemd, which we already do when BR2_PACKAGE_SYSTEMD=y. Isn't that working ?
I found why: we had a custom OPENVPN_INSTALL_TARGET_CMDS instead of relying on the default "make install" behavior of the autotools-package infra. So, I made a follow-up commit that drops this as well as the custom systemd installation stuff, as "make install" does it all properly.
See:
https://git.buildroot.org/buildroot/commit/?id=30bc58d3766b240017120a25d843da0a2c5cf501
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/openvpn: adds target install of systemd unit files
Indeed I just arrived at the same conclusion, that OPENVPN_INSTALL_TARGET_CMDS, was overriding the default autotools install.
The following items get added now correctly to the target
./usr/share/doc/openvpn ./usr/include/openvpn-msg.h ./usr/include/openvpn-plugin.h ./usr/lib/systemd/system/openvpn-server at .service ./usr/lib/systemd/system/openvpn-client at .service ./usr/lib/openvpn ./usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.la ./usr/lib/openvpn/plugins/openvpn-plugin-down-root.so ./usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so ./usr/lib/openvpn/plugins/openvpn-plugin-down-root.la ./usr/lib/tmpfiles.d/openvpn.conf ./usr/sbin/openvpn
Add after the documentation, headers and statics libs (in my case shared only) get removed.
./usr/lib/systemd/system/openvpn-server at .service ./usr/lib/systemd/system/openvpn-client at .service ./usr/lib/openvpn ./usr/lib/openvpn/plugins/openvpn-plugin-down-root.so ./usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so ./usr/lib/tmpfiles.d/openvpn.conf ./usr/sbin/openvpn
Thank you, for the fix.
Best regards,
Edmundo
Quoted 19 lines · Thomas Petazzoni
Quoted 4 lines · On Thu, 31 Dec 2020 15:43:32 +0100 Thomas Petazzoni…
Hum, I've applied, but reading again distro/systemd/Makefile.am, it seems like manually copying those files is not needed. If you pass --enable-systemd, which we already do when BR2_PACKAGE_SYSTEMD=y. Isn't that working ?
I found why: we had a custom
OPENVPN_INSTALL_TARGET_CMDSinstead of relying on the default "make install" behavior of the autotools-package infra. So, I made a follow-up commit that drops this as well as the custom systemd installation stuff, as "make install" does it all properly.See:
https://git.buildroot.org/buildroot/commit/?id=30bc58d3766b240017120a25d843da0a2c5cf501
Quoted 8 lines
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210101/72022751/attachment.html>
PATCH 1/1 package/openvpn: adds target install of systemd unit files
In reply to Thomas PetazzoniQuoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Quoted 4 lines · On Thu, 31 Dec 2020 15:43:32 +0100 Thomas Petazzoni…
Hum, I've applied, but reading again distro/systemd/Makefile.am, it seems like manually copying those files is not needed. If you pass --enable-systemd, which we already do when BR2_PACKAGE_SYSTEMD=y. Isn't that working ?
Quoted 5 lines
I found why: we had a custom
OPENVPN_INSTALL_TARGET_CMDSinstead of relying on the default "make install" behavior of the autotools-package infra. So, I made a follow-up commit that drops this as well as the custom systemd installation stuff, as "make install" does it all properly.
Committed to 2020.02.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/openvpn: adds target install of systemd unit files
In reply to Edmundo FerreiraQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Edmundo" == Edmundo Ferreira <[email protected]> writes:
From: Edmundo Ferreira <[email protected]>
Signed-off-by Edmundo Ferreira <[email protected]>
Committed to 2020.02.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard