From 84d465cedb92969431d640fa40cf49652a6867d7 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 23 Aug 2020 02:47:49 +0800 Subject: [PATCH] brook: update PKG_SOURCE --- package/lienol/brook/Makefile | 47 +++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/package/lienol/brook/Makefile b/package/lienol/brook/Makefile index debe9bac36..ea6823ee82 100644 --- a/package/lienol/brook/Makefile +++ b/package/lienol/brook/Makefile @@ -5,40 +5,45 @@ # include $(TOPDIR)/rules.mk - -ifeq ($(ARCH),x86_64) - PKG_ARCH_BROOK:= -endif -ifeq ($(ARCH),mipsel) - PKG_ARCH_BROOK:=_linux_mipsle -endif -ifeq ($(ARCH),mips) - PKG_ARCH_BROOK:=_linux_mips -endif ifeq ($(ARCH),i386) - PKG_ARCH_BROOK:=_linux_386 + PKG_ARCH_BROOK:=386 +endif +ifeq ($(ARCH),x86_64) + PKG_ARCH_BROOK:=amd64 endif ifeq ($(ARCH),arm) - PKG_ARCH_BROOK:=_linux_arm7 + PKG_ARCH_BROOK:=arm7 endif ifeq ($(BOARD),bcm53xx) - PKG_ARCH_BROOK:=_linux_arm6 + PKG_ARCH_BROOK:=arm6 ifeq ($(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))),) - PKG_ARCH_BROOK:=_linux_arm5 + PKG_ARCH_BROOK:=arm5 endif endif ifeq ($(BOARD),kirkwood) - PKG_ARCH_BROOK:=_linux_arm5 + PKG_ARCH_BROOK:=arm5 endif ifeq ($(ARCH),aarch64) - PKG_ARCH_BROOK:=_linux_arm64 + PKG_ARCH_BROOK:=arm64 +endif +ifeq ($(ARCH),mips) + PKG_ARCH_BROOK:=mips_softfloat +endif +ifeq ($(ARCH),mipsel) + PKG_ARCH_BROOK:=mipsle_softfloat +endif +ifeq ($(ARCH),mips64) + PKG_ARCH_BROOK:=mips64 +endif +ifeq ($(ARCH),mips64el) + PKG_ARCH_BROOK:=mips64le endif PKG_NAME:=brook PKG_VERSION:=20200901 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=brook$(PKG_ARCH_BROOK) +PKG_SOURCE:=brook_linux_$(PKG_ARCH_BROOK) PKG_SOURCE_URL:=https://github.com/txthinking/brook/releases/download/v$(PKG_VERSION) PKG_HASH:=skip @@ -48,7 +53,7 @@ define Package/$(PKG_NAME) SECTION:=net CATEGORY:=Network TITLE:=Brook is a cross-platform proxy software - DEPENDS:= + DEPENDS:=@!(arc||armeb||powerpc) URL:=https://github.com/txthinking/brook endef @@ -57,7 +62,7 @@ define Package/$(PKG_NAME)/description endef define Build/Prepare - cp $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR) + $(CP) $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/ endef define Build/Configure @@ -68,7 +73,7 @@ endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/brook$(PKG_ARCH_BROOK) $(1)/usr/bin/brook + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_SOURCE) $(1)/usr/bin/brook endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file