diff --git a/package/lean/baidupcs-web/Makefile b/package/lean/baidupcs-web/Makefile index 7f00fbb6f..68ec6d9f9 100644 --- a/package/lean/baidupcs-web/Makefile +++ b/package/lean/baidupcs-web/Makefile @@ -9,80 +9,54 @@ include $(TOPDIR)/rules.mk PKG_NAME:=baidupcs-web -PKG_VERSION:=3.7.1 -PKG_RELEASE:=2 +PKG_VERSION:=3.7.3 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/Erope/BaiduPCS-Go.git +PKG_SOURCE_VERSION:=b2f5436699d1acd6dc3d90f2066bf1e36c373cd5 +PKG_MIRROR_HASH:=815410a7c348c82eea638f6d34fd4dfab59286e16b172c434ff0008de24676dc + +PKG_LICENSE:=Apache-2.0 +PKG_LICENSE_FILES:=LICENSE + +PKG_BUILD_DEPENDS:=golang/host +PKG_BUILD_PARALLEL:=1 +PKG_USE_MIPS16:=0 + +GO_PKG:=github.com/Erope/BaiduPCS-Go +GO_PKG_LDFLAGS:=-s -w +GO_PKG_LDFLAGS_X:=main.Version=v$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk +include ../../lang/golang/golang-package.mk define Package/$(PKG_NAME) SECTION:=net CATEGORY:=Network TITLE:=BaiduPCS-Web is a web controller for BaiduPCS-Go - URL:=https://github.com/Erope/baidupcs-web + URL:=https://github.com/Erope/BaiduPCS-Go + DEPENDS:=$(GO_ARCH_DEPENDS) endef - define Package/$(PKG_NAME)/description BaiduPCS-Web is a web controller for BaiduPCS-Go endef -# 禁止OpenWrt对二进制文件进行strip -STRIP:=true - -ifeq ($(ARCH),i386) - PKG_ARCH_BAIDUPCS-WEB:=386 -endif - -ifeq ($(ARCH),x86_64) - PKG_ARCH_BAIDUPCS-WEB:=amd64 -endif - -ifeq ($(ARCH),mipsel) - PKG_ARCH_BAIDUPCS-WEB:=mipsle -endif - -ifeq ($(ARCH),mips) - PKG_ARCH_BAIDUPCS-WEB:=mipsle -endif - -ifeq ($(ARCH),arm) -ifeq ($(BOARD),bcm53xx) - PKG_ARCH_BAIDUPCS-WEB:=armv5 -else ifeq ($(BOARD),kirkwood) - PKG_ARCH_BAIDUPCS-WEB:=armv5 -else - PKG_ARCH_BAIDUPCS-WEB:=armv7 -endif -endif - -ifeq ($(ARCH),aarch64) - PKG_ARCH_BAIDUPCS-WEB:=arm64 -endif - - -PKG_SOURCE:=BaiduPCS-Go-v$(PKG_VERSION)-linux-$(PKG_ARCH_BAIDUPCS-WEB).zip - -PKG_SOURCE_URL:=https://github.com/coolsnowwolf/baidupcs-web/raw/master/ - -UNZIP_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME)-unzip - -PKG_HASH:=skip - -define Build/Prepare - mkdir -vp $(UNZIP_DIR) - unzip -od $(UNZIP_DIR) $(DL_DIR)/$(PKG_SOURCE) -endef - -define Build/Configure -endef - define Build/Compile +( \ + GOOS=$$$$(go env GOOS) GOARCH=$$$$(go env GOARCH) go get -v github.com/GeertJohan/go.rice/rice/... ; \ + cd $(PKG_BUILD_DIR)/internal/pcsweb ; \ + "$$$$(go env GOPATH)/bin/rice" embed-go ; \ +) + $(call GoPackage/Build/Compile) endef define Package/$(PKG_NAME)/install + $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(UNZIP_DIR)/*/BaiduPCS-Go $(1)/usr/bin/$(PKG_NAME) - chmod 755 $(1)/usr/bin/$(PKG_NAME) + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/BaiduPCS-Go $(1)/usr/bin/$(PKG_NAME) endef +$(eval $(call GoBinPackage,$(PKG_NAME))) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lean/baidupcs-web/patches/001-add-missing-go-sum.patch b/package/lean/baidupcs-web/patches/001-add-missing-go-sum.patch new file mode 100644 index 000000000..820d44353 --- /dev/null +++ b/package/lean/baidupcs-web/patches/001-add-missing-go-sum.patch @@ -0,0 +1,21 @@ +--- a/go.sum ++++ b/go.sum +@@ -45,6 +45,7 @@ github.com/daaku/go.zipexe v1.0.1 h1:wV4zMsDOI2SZ2m7Tdz1Ps96Zrx+TzaK15VbUaGozw0M + github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8= + github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= + github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= + github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= + github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI= +--- a/pcsutil/jwted25519/jwted25519.go ++++ b/pcsutil/jwted25519/jwted25519.go +@@ -2,7 +2,7 @@ package jwted25519 + + import ( + "github.com/dgrijalva/jwt-go" +- "golang.org/x/crypto/ed25519" ++ "crypto/ed25519" + "unsafe" + ) +