From 9a242ce509f141959dadc52ec325b6ed971a9362 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 24 Mar 2020 20:45:14 +0800 Subject: [PATCH] syncthing: fixup version detection --- package/lean/luci-app-nft-qos/Makefile | 2 +- package/zxlhhyccc/syncthing/Makefile | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/lean/luci-app-nft-qos/Makefile b/package/lean/luci-app-nft-qos/Makefile index 01de879937..8349e775f6 100644 --- a/package/lean/luci-app-nft-qos/Makefile +++ b/package/lean/luci-app-nft-qos/Makefile @@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Qos over Nftables LUCI_DEPENDS:=+nft-qos -include ../../luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/package/zxlhhyccc/syncthing/Makefile b/package/zxlhhyccc/syncthing/Makefile index 05277750fc..b1e439fee1 100644 --- a/package/zxlhhyccc/syncthing/Makefile +++ b/package/zxlhhyccc/syncthing/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syncthing PKG_VERSION:=1.4.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) @@ -36,11 +36,12 @@ define Package/syncthing endef GO_PKG_LDFLAGS:= -s -w -GO_PKG_LDFLAGS_X:=\ - main.Version=v$(PKG_VERSION) \ - main.BuildUser=ctcgfw \ - main.BuildHost=project-openwrt \ - main.BuildStamp=$(SOURCE_DATE_EPOCH) +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=ctcgfw \ + github.com/syncthing/syncthing/lib/build.Host=project-openwrt \ + github.com/syncthing/syncthing/lib/build.Program=syncthing define Build/Compile $(call GoPackage/Build/Compile,-tags noupgrade)