[Buildroot] [git commit branch/2020.11.x] package/openvpn: use make install instead of custom install step

Peter Korsgaard peter at korsgaard.com
Tue Jan 5 19:52:28 UTC 2021


commit: https://git.buildroot.net/buildroot/commit/?id=8b74f9ee092bdd24a746c8065593d36f689539ac
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.11.x

Commit 7105e65cd6b8f857bab54e4c0a8c57da776b0564 ("package/openvpn:
adds target install of systemd unit files") added the installation of
systemd unit files. But in fact, they can be installed by openvpn's
build system. It was simply not working due to the custom install step
implemented in openvpn.mk.

So instead, let's have the autotools-package infra call "make
install", which properly installs everything that's needed for
openvpn, including systemd units, but also plugins, etc.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
(cherry picked from commit 30bc58d3766b240017120a25d843da0a2c5cf501)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/openvpn/openvpn.mk | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index caec41e2a5..bc01c893c2 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -72,21 +72,9 @@ else
 OPENVPN_CONF_OPTS += --disable-systemd
 endif
 
-define OPENVPN_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 755 $(@D)/src/openvpn/openvpn \
-		$(TARGET_DIR)/usr/sbin/openvpn
-endef
-
 define OPENVPN_INSTALL_INIT_SYSV
 	$(INSTALL) -m 755 -D package/openvpn/S60openvpn \
 		$(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))


More information about the buildroot mailing list