* [Buildroot] [PATCH 1/1] package/openvpn: adds target install of systemd unit files
@ 2020-12-15 16:36 Edmundo Ferreira
2020-12-31 14:43 ` Thomas Petazzoni
2021-01-05 19:55 ` Peter Korsgaard
0 siblings, 2 replies; 6+ messages in thread
From: Edmundo Ferreira @ 2020-12-15 16:36 UTC (permalink / raw)
To: buildroot
From: Edmundo Ferreira <fc.edmundo@gmail.com>
Signed-off-by: Edmundo Ferreira <fc.edmundo@gmail.com>
---
package/openvpn/openvpn.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 3efc9e2354..399cbf7a85 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -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))
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/openvpn: adds target install of systemd unit files
2020-12-15 16:36 [Buildroot] [PATCH 1/1] package/openvpn: adds target install of systemd unit files Edmundo Ferreira
@ 2020-12-31 14:43 ` Thomas Petazzoni
2020-12-31 16:31 ` Thomas Petazzoni
2021-01-05 19:55 ` Peter Korsgaard
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2020-12-31 14:43 UTC (permalink / raw)
To: buildroot
On Tue, 15 Dec 2020 17:36:10 +0100
Edmundo Ferreira <fc.edmundo@gmail.com> wrote:
> From: Edmundo Ferreira <fc.edmundo@gmail.com>
>
> Signed-off-by: Edmundo Ferreira <fc.edmundo@gmail.com>
> ---
> 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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/openvpn: adds target install of systemd unit files
2020-12-31 14:43 ` Thomas Petazzoni
@ 2020-12-31 16:31 ` Thomas Petazzoni
2021-01-01 21:22 ` Edmundo Ferreira
2021-01-05 19:55 ` Peter Korsgaard
0 siblings, 2 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2020-12-31 16:31 UTC (permalink / raw)
To: buildroot
On Thu, 31 Dec 2020 15:43:32 +0100
Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
> 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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/openvpn: adds target install of systemd unit files
2020-12-31 16:31 ` Thomas Petazzoni
@ 2021-01-01 21:22 ` Edmundo Ferreira
2021-01-05 19:55 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Edmundo Ferreira @ 2021-01-01 21:22 UTC (permalink / raw)
To: buildroot
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
On Thu, Dec 31, 2020 at 5:31 PM Thomas Petazzoni <
thomas.petazzoni@bootlin.com> wrote:
> On Thu, 31 Dec 2020 15:43:32 +0100
> Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
>
> > 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
> --
> 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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/openvpn: adds target install of systemd unit files
2020-12-15 16:36 [Buildroot] [PATCH 1/1] package/openvpn: adds target install of systemd unit files Edmundo Ferreira
2020-12-31 14:43 ` Thomas Petazzoni
@ 2021-01-05 19:55 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2021-01-05 19:55 UTC (permalink / raw)
To: buildroot
>>>>> "Edmundo" == Edmundo Ferreira <fc.edmundo@gmail.com> writes:
> From: Edmundo Ferreira <fc.edmundo@gmail.com>
> Signed-off-by: Edmundo Ferreira <fc.edmundo@gmail.com>
Committed to 2020.02.x and 2020.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/openvpn: adds target install of systemd unit files
2020-12-31 16:31 ` Thomas Petazzoni
2021-01-01 21:22 ` Edmundo Ferreira
@ 2021-01-05 19:55 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2021-01-05 19:55 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:
> On Thu, 31 Dec 2020 15:43:32 +0100
> Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
>> 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.
Committed to 2020.02.x and 2020.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-05 19:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-15 16:36 [Buildroot] [PATCH 1/1] package/openvpn: adds target install of systemd unit files Edmundo Ferreira
2020-12-31 14:43 ` Thomas Petazzoni
2020-12-31 16:31 ` Thomas Petazzoni
2021-01-01 21:22 ` Edmundo Ferreira
2021-01-05 19:55 ` Peter Korsgaard
2021-01-05 19:55 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.