package/openvpn: use make install instead of custom install step
Commit7105e65cd6
("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@bootlin.com> (cherry picked from commit30bc58d376
) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
45f75fb357
commit
eb4ce04c19
@ -58,21 +58,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@.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/openvpn-client@.service
|
||||
$(INSTALL) -D -m 0644 $(@D)/distro/systemd/openvpn-server@.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/openvpn-server@.service
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
Loading…
Reference in New Issue
Block a user