Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions net/openvpn/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn

PKG_VERSION:=2.6.14
PKG_RELEASE:=6
PKG_RELEASE:=7

PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \
Expand Down Expand Up @@ -91,45 +91,42 @@ define Build/Configure
endef

define Package/openvpn-$(BUILD_VARIANT)/install
$(INSTALL_DIR) \
$(1)/usr/sbin \
$(1)/usr/share/openvpn \
$(1)/etc/init.d \
$(1)/etc/config \
$(1)/etc/openvpn \
$(1)/etc/uci-defaults \
$(1)/lib/functions \
$(1)/lib/netifd/proto \
$(1)/lib/upgrade/keep.d \
$(1)/usr/libexec \
$(1)/etc/hotplug.d/openvpn

$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/sbin/openvpn \
$(1)/usr/sbin/

$(INSTALL_DIR) $(1)/lib/netifd/proto
$(INSTALL_BIN) \
files/lib/netifd/proto/openvpn.sh \
$(1)/lib/netifd/proto/

$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) \
files/etc/uci-defaults/60_openvpn_migrate.sh \
$(1)/etc/uci-defaults/

$(INSTALL_DIR) $(1)/usr/share/openvpn
$(INSTALL_DATA) \
files/openvpn.options \
$(1)/usr/share/openvpn/openvpn.options

files/usr/share/openvpn/openvpn.options \
$(1)/usr/share/openvpn/
$(INSTALL_BIN) \
files/up.uc files/down.uc files/route-pre-down.uc files/route-up.uc \
files/ipchange.uc \
files/client-connect.uc files/client-disconnect.uc files/client-crresponse.uc \
files/auth-user-pass-verify.uc files/tls-verify.uc \
files/usr/share/openvpn/up.uc \
files/usr/share/openvpn/down.uc \
files/usr/share/openvpn/route-pre-down.uc \
files/usr/share/openvpn/route-up.uc \
files/usr/share/openvpn/ipchange.uc \
files/usr/share/openvpn/client-connect.uc \
files/usr/share/openvpn/client-disconnect.uc \
files/usr/share/openvpn/client-crresponse.uc \
files/usr/share/openvpn/auth-user-pass-verify.uc \
files/usr/share/openvpn/tls-verify.uc \
$(1)/usr/share/openvpn/

$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
$(INSTALL_DATA) \
files/openvpn.sysupgrade \
$(1)/lib/upgrade/keep.d/openvpn
files/lib/upgrade/keep.d/openvpn \
$(1)/lib/upgrade/keep.d/
Comment on lines +128 to +129

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Florian, we are having a similar discussion here: #30010 (comment)

Could you please also check if conffiles will work for you? I took a look at the repository, and basically, you are the only one using keep.d in this specific way :-)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is working as expected.

root@FG2-999991 / # cat /lib/upgrade/keep.d/openvpn
/etc/openvpn/

root@FG2-999991 / # ls -la /etc/openvpn
drwxr-xr-x    1 root     root          3488 Jul 17 08:33 .
drwxr-xr-x    1 root     root          3488 Jul 15 14:18 ..
-rw-r--r--    1 root     root             0 Jul 17 08:33 test1.sh
-rw-r--r--    1 root     root             0 Jul 17 08:32 test2.sh

root@FG2-999991 / # sysupgrade -l | grep openvpn
/etc/config/openvpn
/etc/config/openvpn_recipes
/etc/openvpn/test1.sh
/etc/openvpn/test2.sh

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, now I get what you mean. I need to add that to the "conffiles" target in the Makefile.
Wait, I'll have to take a look at that and run a build first.
I'll get back to you in a few days.

endef

$(eval $(call BuildPackage,openvpn-openssl))
Expand Down
File renamed without changes.