diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index 9b96884e2d..c02eb4f83a 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -8,25 +8,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray PKG_VERSION:=4.5.0 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_RELEASE:=2 ifeq ($(ARCH),x86_64) - PKG_ARCH_V2RAY:=linux-64 + PKG_ARCH_V2RAY:=amd64 endif ifeq ($(ARCH),mipsel) - PKG_ARCH_V2RAY:=linux-mipsle + PKG_ARCH_V2RAY:=mipsle endif ifeq ($(ARCH),mips) - PKG_ARCH_V2RAY:=linux-mips + PKG_ARCH_V2RAY:=mips endif ifeq ($(ARCH),i386) - PKG_ARCH_V2RAY:=linux-32 + PKG_ARCH_V2RAY:=386 endif ifeq ($(ARCH),arm) - PKG_ARCH_V2RAY:=linux-arm + PKG_ARCH_V2RAY:=arm endif ifeq ($(ARCH),aarch64) - PKG_ARCH_V2RAY:=linux-arm64 + PKG_ARCH_V2RAY:=arm64 endif include $(INCLUDE_DIR)/package.mk @@ -39,49 +39,11 @@ define Package/$(PKG_NAME) URL:=https://github.com/v2ray/v2ray-core endef -define Package/$(PKG_NAME)/config -menu "V2Ray Configuration" - depends on PACKAGE_v2ray - -config PACKAGE_V2RAY_INCLUDE_V2RAY - bool "Include v2ray" - default y - -config PACKAGE_V2RAY_SOFTFLOAT - bool "Use soft-float binaries (mips/mipsle only)" - depends on PACKAGE_V2RAY_INCLUDE_V2RAY - default n - -config PACKAGE_V2RAY_INCLUDE_V2CTL - bool "Include v2ctl" - depends on PACKAGE_V2RAY_INCLUDE_V2RAY - default y - -config PACKAGE_V2RAY_INCLUDE_GEOIP - bool "Include geoip.dat" - depends on PACKAGE_V2RAY_INCLUDE_V2CTL - default n - -config PACKAGE_V2RAY_INCLUDE_GEOSITE - bool "Include geosite.dat" - depends on PACKAGE_V2RAY_INCLUDE_V2CTL - default n - -endmenu -endef - define Package/$(PKG_NAME)/description V2Ray is a cross-platform proxy software endef define Build/Prepare - - wget https://github.com/v2ray/v2ray-core/releases/download/v$(PKG_VERSION)/v2ray-$(PKG_ARCH_V2RAY).zip -O $(PKG_BUILD_DIR)/v2ray-$(PKG_VERSION)-$(PKG_ARCH_V2RAY).zip - unzip -o $(PKG_BUILD_DIR)/v2ray-$(PKG_VERSION)-$(PKG_ARCH_V2RAY).zip -d $(PKG_BUILD_DIR) -ifdef CONFIG_PACKAGE_V2RAY_SOFTFLOAT - [ -f $(PKG_BUILD_DIR)/v2ray_softfloat ] && mv $(PKG_BUILD_DIR)/v2ray_softfloat $(PKG_BUILD_DIR)/v2ray || echo "Can't find soft-float binary." - [ -f $(PKG_BUILD_DIR)/v2ctl_softfloat ] && mv $(PKG_BUILD_DIR)/v2ctl_softfloat $(PKG_BUILD_DIR)/v2ctl || echo "Can't find soft-float binary." -endif endef define Build/Configure @@ -92,18 +54,7 @@ endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin/v2ray -ifdef CONFIG_PACKAGE_V2RAY_INCLUDE_V2RAY - $(INSTALL_BIN) $(PKG_BUILD_DIR)/v2ray $(1)/usr/bin/v2ray/ -endif -ifdef CONFIG_PACKAGE_V2RAY_INCLUDE_V2CTL - $(INSTALL_BIN) $(PKG_BUILD_DIR)/v2ctl $(1)/usr/bin/v2ray/ -endif -ifdef CONFIG_PACKAGE_V2RAY_INCLUDE_GEOIP - $(INSTALL_BIN) $(PKG_BUILD_DIR)/geoip.dat $(1)/usr/bin/v2ray/ -endif -ifdef CONFIG_PACKAGE_V2RAY_INCLUDE_GEOSITE - $(INSTALL_BIN) $(PKG_BUILD_DIR)/geosite.dat $(1)/usr/bin/v2ray/ -endif + $(INSTALL_BIN) ./files/$(ARCH)/v2ray $(1)/usr/bin/v2ray/ endef -$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lean/v2ray/files/386/v2ray b/package/lean/v2ray/files/386/v2ray new file mode 100755 index 0000000000..628c1dde35 Binary files /dev/null and b/package/lean/v2ray/files/386/v2ray differ diff --git a/package/lean/v2ray/files/amd64/v2ray b/package/lean/v2ray/files/amd64/v2ray new file mode 100755 index 0000000000..633bd7f9de Binary files /dev/null and b/package/lean/v2ray/files/amd64/v2ray differ diff --git a/package/lean/v2ray/files/arm/v2ray b/package/lean/v2ray/files/arm/v2ray new file mode 100755 index 0000000000..7ce298a0f7 Binary files /dev/null and b/package/lean/v2ray/files/arm/v2ray differ diff --git a/package/lean/v2ray/files/arm64/v2ray b/package/lean/v2ray/files/arm64/v2ray new file mode 100755 index 0000000000..a613b2839e Binary files /dev/null and b/package/lean/v2ray/files/arm64/v2ray differ diff --git a/package/lean/v2ray/files/mips/v2ray b/package/lean/v2ray/files/mips/v2ray new file mode 100755 index 0000000000..0f3c4b4e51 Binary files /dev/null and b/package/lean/v2ray/files/mips/v2ray differ diff --git a/package/lean/v2ray/files/mipsle/v2ray b/package/lean/v2ray/files/mipsle/v2ray new file mode 100755 index 0000000000..7ae694f23b Binary files /dev/null and b/package/lean/v2ray/files/mipsle/v2ray differ