From 20a36131611e909f2e47b33ed5873172cca496b6 Mon Sep 17 00:00:00 2001 From: sbwml <984419930@qq.com> Date: Fri, 9 Sep 2022 17:50:05 +0800 Subject: [PATCH] alist: bump to 3.0.0-beta.0 --- alist/Makefile | 23 ++++++----- alist/files/assets/circle_center.svg | 10 ----- alist/files/assets/http_can_circle.svg | 10 ----- ...ert-feat-clear-temp-file-while-start.patch | 38 ------------------- 4 files changed, 13 insertions(+), 68 deletions(-) delete mode 100644 alist/files/assets/circle_center.svg delete mode 100644 alist/files/assets/http_can_circle.svg delete mode 100644 alist/patches/0001-Revert-feat-clear-temp-file-while-start.patch diff --git a/alist/Makefile b/alist/Makefile index daf521b..e376ebf 100644 --- a/alist/Makefile +++ b/alist/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alist -PKG_VERSION:=2.6.4 -PKG_WEB_VERSION:=2.6.4 +PKG_VERSION:=3.0.0-beta.0 +PKG_WEB_VERSION:=3.0.0-beta.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3860f5cec5d809159c55498874c472386cd6142a932a5e7bbfb3b0f569e3e12b +PKG_HASH:=971f69bbc4fe550d4dc7f10a40290d48f8a019878ea4719da473b68297571804 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILE:=LICENSE @@ -22,8 +22,8 @@ PKG_MAINTAINER:=sbwml define Download/$(PKG_NAME)-web FILE:=$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz URL_FILE:=dist.tar.gz - URL:=https://github.com/alist-org/web-v2/releases/download/$(PKG_WEB_VERSION)/ - HASH:=4189ce3c523e6b8f6bba55faefabc926f6ef793c8755c5c2a2d3f75532fb2243 + URL:=https://github.com/alist-org/alist-web/releases/download/$(PKG_WEB_VERSION)/ + HASH:=050abbc1568bd4098027a29f8956916a6f96fd69f8989e253d021deca579d32c endef PKG_CONFIG_DEPENDS:=CONFIG_ALIST_COMPRESS_UPX @@ -32,10 +32,13 @@ PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 -GO_PKG:=github.com/Xhofe/alist -ALIST_PKG:=github.com/Xhofe/alist/conf +PKG_ALIST:=github.com/alist-org/alist/v3/internal/conf +GO_PKG:=github.com/alist-org/alist GO_PKG_LDFLAGS:=-w -s -GO_PKG_LDFLAGS_X:=$(ALIST_PKG).GitTag=v$(PKG_VERSION)-$(ARCH) +GO_PKG_LDFLAGS_X:= \ + $(PKG_ALIST).Version=v$(PKG_VERSION)-$(ARCH) \ + $(PKG_ALIST).WebVersion=$(PKG_WEB_VERSION) \ + $(PKG_ALIST).BuiltAt=$(shell date "+%F %T %z") include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk @@ -66,8 +69,8 @@ endef define Build/Prepare $(call Build/Prepare/Default) $(eval $(call Download,$(PKG_NAME)-web)) - $(TAR) --strip-components=1 -C $(PKG_BUILD_DIR)/public -xzf $(DL_DIR)/$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz - $(CP) ./files/assets/. $(PKG_BUILD_DIR)/public/assets/ + $(TAR) --strip-components=1 -C $(PKG_BUILD_DIR)/public/dist -xzf $(DL_DIR)/$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz + $(CP) ./files/assets/. $(PKG_BUILD_DIR)/public/dist/assets/ endef define Build/Compile diff --git a/alist/files/assets/circle_center.svg b/alist/files/assets/circle_center.svg deleted file mode 100644 index bc49a26..0000000 --- a/alist/files/assets/circle_center.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/alist/files/assets/http_can_circle.svg b/alist/files/assets/http_can_circle.svg deleted file mode 100644 index cab3c49..0000000 --- a/alist/files/assets/http_can_circle.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/alist/patches/0001-Revert-feat-clear-temp-file-while-start.patch b/alist/patches/0001-Revert-feat-clear-temp-file-while-start.patch deleted file mode 100644 index 7aaf37d..0000000 --- a/alist/patches/0001-Revert-feat-clear-temp-file-while-start.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fdcb81f6ba8b8d7546a6742e9566487e12815499 Mon Sep 17 00:00:00 2001 -From: sbwml -Date: Thu, 28 Apr 2022 11:10:53 +0800 -Subject: [PATCH] Revert "feat: clear temp file while start" - -This reverts commit 24d031d57875d3c6a9624fa7334c6eac1c9111fb. ---- - bootstrap/conf.go | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/bootstrap/conf.go b/bootstrap/conf.go -index 5c9a1b3..f4d87d4 100644 ---- a/bootstrap/conf.go -+++ b/bootstrap/conf.go -@@ -7,7 +7,6 @@ import ( - log "github.com/sirupsen/logrus" - "io/ioutil" - "os" -- "path/filepath" - ) - - // InitConf init config -@@ -47,11 +46,7 @@ func InitConf() { - if !conf.Conf.Force { - confFromEnv() - } -- err := os.RemoveAll(filepath.Join(conf.Conf.TempDir)) -- if err != nil { -- log.Errorln("failed delete temp file:", err) -- } -- err = os.MkdirAll(conf.Conf.TempDir, 0700) -+ err := os.MkdirAll(conf.Conf.TempDir, 0700) - if err != nil { - log.Fatalf("create temp dir error: %s", err.Error()) - } --- -2.34.1 -