commit c8add3368b8bd7767bbd540539dcd4a97112b4e1
parent 13ec95789ed55001a16e2cf0f84945b1bbef6419
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date: Wed, 15 Feb 2017 11:08:24 +0200
Merge pull request #4011 from stangri/vpnbypass
vpnbypass: fixed makefile and removed screenshot from .files/
Diffstat:
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/net/vpnbypass/Makefile b/net/vpnbypass/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vpnbypass
PKG_VERSION:=1.1.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
@@ -32,6 +32,9 @@ define Package/$(PKG_NAME)/conffiles
endef
define Build/Prepare
+ mkdir -p $(PKG_BUILD_DIR)/files/
+ $(CP) ./files/vpnbypass.init $(PKG_BUILD_DIR)/files/vpnbypass.init
+ sed -i "s|^\(PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|" $(PKG_BUILD_DIR)/files/vpnbypass.init
endef
define Build/Configure
@@ -42,7 +45,7 @@ endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/vpnbypass.init $(1)/etc/init.d/vpnbypass
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/vpnbypass.init $(1)/etc/init.d/vpnbypass
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/vpnbypass.conf $(1)/etc/config/vpnbypass
$(INSTALL_DIR) $(1)/etc/hotplug.d/firewall
diff --git a/net/vpnbypass/files/README.md b/net/vpnbypass/files/README.md
@@ -11,7 +11,7 @@ A simple PROCD-based vpnbypass service for OpenWrt/LEDE Project. Useful if your
- Proudly made in Canada, using locally-sourced electrons.
## Screenshot (luci-app-vpnbypass)
-
+
## Requirements
This service requires following packages to be installed on your router: ```ip-full ipset iptables dnsmasq-full``` (```ip-full``` requires you uninstall ```ip``` first; ```dnsmasq-full``` requires you uninstall ```dnsmasq``` first). Run the following commands to satisfy the requirements:
diff --git a/net/vpnbypass/files/screenshot.png b/net/vpnbypass/files/screenshot.png
Binary files differ.
