From db78655bb82b18be7c618d424671c6baf4b091ac Mon Sep 17 00:00:00 2001 From: Van Waholtz Date: Thu, 5 Jan 2023 18:59:11 +0800 Subject: [PATCH] syncthing: update to 1.23.0 Signed-off-by: Van Waholtz (cherry picked from commit 27b1869820eb88ec14991ccdbecb47e0c35c40c0) --- utils/syncthing/Makefile | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile index 6848bd6ca3..9feb2e93cc 100644 --- a/utils/syncthing/Makefile +++ b/utils/syncthing/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syncthing -PKG_VERSION:=1.22.2 +PKG_VERSION:=1.23.0 PKG_RELEASE:=1 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) -PKG_HASH:=211704904788808ef2818994fb36e33c3e33ed1b52267f7adbf1411fa5ee2d2f +PKG_HASH:=0f66d3dd2a7915a6f3ca6773c1dc02345444b2644a533211ce1ee57b371ae458 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME) @@ -19,19 +19,19 @@ PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 -GO_PKG:=github.com/syncthing/syncthing/ +GO_PKG:=github.com/syncthing/syncthing GO_PKG_BUILD_PKG:=\ - $(if $(CONFIG_PACKAGE_syncthing),github.com/syncthing/syncthing/cmd/syncthing/) \ - $(if $(CONFIG_PACKAGE_stdiscosrv),github.com/syncthing/syncthing/cmd/stdiscosrv/) \ - $(if $(CONFIG_PACKAGE_strelaysrv),github.com/syncthing/syncthing/cmd/strelaysrv/) + $(if $(CONFIG_PACKAGE_syncthing),$(GO_PKG)/cmd/syncthing/) \ + $(if $(CONFIG_PACKAGE_stdiscosrv),$(GO_PKG)/cmd/stdiscosrv/) \ + $(if $(CONFIG_PACKAGE_strelaysrv),$(GO_PKG)/cmd/strelaysrv/) GO_PKG_INSTALL_EXTRA:=^gui/ GO_PKG_LDFLAGS_X:=\ - github.com/syncthing/syncthing/lib/build.Version=v$(PKG_VERSION) \ - github.com/syncthing/syncthing/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \ - github.com/syncthing/syncthing/lib/build.User=openwrt \ - github.com/syncthing/syncthing/lib/build.Host=openwrt \ - github.com/syncthing/syncthing/lib/build.Tags=noupgrade + $(GO_PKG)/lib/build.Version=v$(PKG_VERSION) \ + $(GO_PKG)/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \ + $(GO_PKG)/lib/build.User=openwrt \ + $(GO_PKG)/lib/build.Host=openwrt \ + $(GO_PKG)/lib/build.Tags=noupgrade GO_PKG_TAGS:=noupgrade include $(INCLUDE_DIR)/package.mk @@ -90,11 +90,9 @@ define Package/strelaysrv/description Relay server for syncthing endef -define Build/Install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) -endef - define SyncthingInstall + $(INSTALL_DIR) $(1)/etc/$(2) + $(INSTALL_DIR) $(1)/etc/config/ $(INSTALL_CONF) $(CURDIR)/files/$(2).conf $(1)/etc/config/$(2) @@ -102,7 +100,7 @@ define SyncthingInstall $(INSTALL_BIN) $(CURDIR)/files/$(2).init $(1)/etc/init.d/$(2) $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $(1)/usr/bin + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/$(2) $(1)/usr/bin endef -- 2.30.2