diff --git a/ruantiblock-mod-lua/Makefile b/ruantiblock-mod-lua/Makefile index 30c4663..ee54d8e 100644 --- a/ruantiblock-mod-lua/Makefile +++ b/ruantiblock-mod-lua/Makefile @@ -8,32 +8,32 @@ PKG_NAME:=ruantiblock-mod-lua PKG_VERSION:=0.9.1 PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=Lua module for ruantiblock - URL:=https://github.com/gSpotx2f/ruantiblock_openwrt - PKGARCH:=all - DEPENDS:=+ruantiblock +lua +luasocket +luasec +luabitop +iconv +idn + SECTION:=net + CATEGORY:=Network + TITLE:=Lua module for ruantiblock + URL:=https://github.com/gSpotx2f/ruantiblock_openwrt + PKGARCH:=all + DEPENDS:=+ruantiblock +lua +luasocket +luasec +luabitop +iconv +idn endef define Package/$(PKG_NAME)/description - endef -define Build/Prepare - $(CP) -r ./files $(PKG_BUILD_DIR)/files +define Build/Configure +endef + +define Build/Compile endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/libexec/ruantiblock - $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/usr/libexec/ruantiblock/ruab_parser.lua $(1)/usr/libexec/ruantiblock/ruab_parser.lua + $(INSTALL_BIN) ./files/usr/libexec/ruantiblock/ruab_parser.lua $(1)/usr/libexec/ruantiblock/ruab_parser.lua $(INSTALL_DIR) $(1)/usr/lib/lua - $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/usr/lib/lua/ruab_sum_ip.lua $(1)/usr/lib/lua/ruab_sum_ip.lua + $(INSTALL_DATA) ./files/usr/lib/lua/ruab_sum_ip.lua $(1)/usr/lib/lua/ruab_sum_ip.lua endef $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/ruantiblock-mod-py/Makefile b/ruantiblock-mod-py/Makefile index de45608..02ab551 100644 --- a/ruantiblock-mod-py/Makefile +++ b/ruantiblock-mod-py/Makefile @@ -8,32 +8,32 @@ PKG_NAME:=ruantiblock-mod-py PKG_VERSION:=0.9.1 PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=Python module for ruantiblock - URL:=https://github.com/gSpotx2f/ruantiblock_openwrt - PKGARCH:=all - DEPENDS:=+ruantiblock +python3 +python3-setuptools +python3-openssl + SECTION:=net + CATEGORY:=Network + TITLE:=Python module for ruantiblock + URL:=https://github.com/gSpotx2f/ruantiblock_openwrt + PKGARCH:=all + DEPENDS:=+ruantiblock +python3 +python3-setuptools +python3-openssl endef define Package/$(PKG_NAME)/description - endef -define Build/Prepare - $(CP) -r ./files $(PKG_BUILD_DIR)/files +define Build/Configure +endef + +define Build/Compile endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/libexec/ruantiblock - $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/usr/libexec/ruantiblock/ruab_parser.py $(1)/usr/libexec/ruantiblock/ruab_parser.py - $(INSTALL_DIR) $(1)/usr/lib/python3.7 - $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/usr/lib/python3.7/ruab_sum_ip.py $(1)/usr/lib/python3.7/ruab_sum_ip.py + $(INSTALL_BIN) ./files/usr/libexec/ruantiblock/ruab_parser.py $(1)/usr/libexec/ruantiblock/ruab_parser.py + $(INSTALL_DIR) $(1)/usr/lib/python3.9 + $(INSTALL_DATA) ./files/usr/lib/python3.9/ruab_sum_ip.py $(1)/usr/lib/python3.9/ruab_sum_ip.py endef $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/ruantiblock-mod-py/files/usr/lib/python3.7/ruab_sum_ip.py b/ruantiblock-mod-py/files/usr/lib/python3.9/ruab_sum_ip.py similarity index 100% rename from ruantiblock-mod-py/files/usr/lib/python3.7/ruab_sum_ip.py rename to ruantiblock-mod-py/files/usr/lib/python3.9/ruab_sum_ip.py diff --git a/ruantiblock/Makefile b/ruantiblock/Makefile index b5a20c6..ca904d9 100644 --- a/ruantiblock/Makefile +++ b/ruantiblock/Makefile @@ -8,52 +8,52 @@ PKG_NAME:=ruantiblock PKG_VERSION:=0.9.1 PKG_RELEASE:=1 PKG_MAINTAINER:=gSpot -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=Ruantiblock - URL:=https://github.com/gSpotx2f/ruantiblock_openwrt - PKGARCH:=all - DEPENDS:=+wget +ipset +kmod-ipt-ipset +dnsmasq-full + SECTION:=net + CATEGORY:=Network + TITLE:=Ruantiblock + URL:=https://github.com/gSpotx2f/ruantiblock_openwrt + PKGARCH:=all + DEPENDS:=+wget +ipset +kmod-ipt-ipset +dnsmasq-full endef define Package/$(PKG_NAME)/description - endef define Package/$(PKG_NAME)/conffiles - /etc/config/ruantiblock - /etc/ruantiblock/ruantiblock.conf - /etc/ruantiblock/fqdn_filter - /etc/ruantiblock/ip_filter - /etc/ruantiblock/user_entries +/etc/config/ruantiblock +/etc/ruantiblock/ruantiblock.conf +/etc/ruantiblock/fqdn_filter +/etc/ruantiblock/ip_filter +/etc/ruantiblock/user_entries endef -define Build/Prepare - $(CP) -r ./files $(PKG_BUILD_DIR)/files +define Build/Configure +endef + +define Build/Compile endef define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/usr/bin/ruantiblock $(1)/usr/bin/ruantiblock - $(INSTALL_DIR) $(1)/etc/ruantiblock - $(INSTALL_CONF) $(PKG_BUILD_DIR)/files/etc/ruantiblock/ruantiblock.conf $(1)/etc/ruantiblock/ruantiblock.conf - $(INSTALL_CONF) $(PKG_BUILD_DIR)/files/etc/ruantiblock/fqdn_filter $(1)/etc/ruantiblock/fqdn_filter - $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/hotplug.d/iface/40-ruantiblock $(1)/etc/hotplug.d/iface/40-ruantiblock - $(INSTALL_DIR) $(1)/etc/ruantiblock/scripts - $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/etc/ruantiblock/scripts/config_script $(1)/etc/ruantiblock/scripts/config_script - $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/etc/ruantiblock/scripts/info_output $(1)/etc/ruantiblock/scripts/info_output - $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/etc/ruantiblock/scripts/ipt_functions $(1)/etc/ruantiblock/scripts/ipt_functions - $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/ruantiblock/scripts/start_script $(1)/etc/ruantiblock/scripts/start_script $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) $(PKG_BUILD_DIR)/files/etc/config/ruantiblock $(1)/etc/config/ruantiblock + $(INSTALL_CONF) ./files/etc/config/ruantiblock $(1)/etc/config/ruantiblock $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/init.d/ruantiblock $(1)/etc/init.d/ruantiblock + $(INSTALL_BIN) ./files/etc/init.d/ruantiblock $(1)/etc/init.d/ruantiblock + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_BIN) ./files/etc/hotplug.d/iface/40-ruantiblock $(1)/etc/hotplug.d/iface/40-ruantiblock + $(INSTALL_DIR) $(1)/etc/ruantiblock + $(INSTALL_CONF) ./files/etc/ruantiblock/ruantiblock.conf $(1)/etc/ruantiblock/ruantiblock.conf + $(INSTALL_CONF) ./files/etc/ruantiblock/fqdn_filter $(1)/etc/ruantiblock/fqdn_filter + $(INSTALL_DIR) $(1)/etc/ruantiblock/scripts + $(INSTALL_DATA) ./files/etc/ruantiblock/scripts/config_script $(1)/etc/ruantiblock/scripts/config_script + $(INSTALL_DATA) ./files/etc/ruantiblock/scripts/info_output $(1)/etc/ruantiblock/scripts/info_output + $(INSTALL_DATA) ./files/etc/ruantiblock/scripts/ipt_functions $(1)/etc/ruantiblock/scripts/ipt_functions + $(INSTALL_BIN) ./files/etc/ruantiblock/scripts/start_script $(1)/etc/ruantiblock/scripts/start_script + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) ./files/usr/bin/ruantiblock $(1)/usr/bin/ruantiblock endef define Package/$(PKG_NAME)/preinst