Merge pull request #67 from 1054009064/main

Rework #65

.github/update.py

@@ -38,7 +38,7 @@ def fetch_latest_release():
 def main():
     version, sha256 = fetch_latest_release()
     if os.getenv("GITHUB_ACTIONS"):
-        print(f"::set-output name=NETBIRD_VERSION::{version}")
+        print(f"NETBIRD_VERSION={version}", file=open(os.environ["GITHUB_OUTPUT"], "a"))
 
     with open("netbird/Makefile") as f:
         makefile = f.read()

.github/workflows/CI.yml

@@ -50,7 +50,6 @@ jobs:
           wget -O openwrt-sdk.tar.xz ${{ matrix.target.sdk }}
           xz -q -d openwrt-sdk.tar.xz && tar -xvf openwrt-sdk.tar
           mv -f openwrt-sdk-* openwrt-sdk
-          mv -f .github/feeds.conf.default openwrt-sdk/feeds.conf.default
       - name: Build Package
         run: |
           echo "src-link netbird $GITHUB_WORKSPACE" > openwrt-sdk/feeds.conf
@@ -59,9 +58,10 @@ jobs:
           cd openwrt-sdk
 
           git clone https://github.com/kuoruan/openwrt-upx.git package/upx
-          git -C package/upx checkout 2c2ee0d696ea6084bee893a2861a7ed0729728ed
+          git -C package/upx checkout 2c2ee0d696ea6084bee893a2861a7ed0729728ed # upx version: v2022-10-20
 
-          cat feeds.conf.default >> feeds.conf
+          #cat feeds.conf.default >> feeds.conf
+          echo 'src-git packages https://git.openwrt.org/feed/packages.git^8939b43659dabe9b737feee02976949ad0355adc' >> feeds.conf # feeds/packages: OpenWrt v23.05.0-rc2
           cat feeds.conf
 
           ./scripts/feeds update -a > /dev/null

netbird/Makefile

@@ -17,7 +17,7 @@ PKG_USE_MIPS16:=0
 GO_PKG:=github.com/netbirdio/netbird
 GO_PKG_BUILD_PKG:=github.com/netbirdio/netbird/client
 GO_PKG_LDFLAGS:=-s -w
-GO_PKG_LDFLAGS_X:=github.com/netbirdio/netbird/client/system.version=$(PKG_VERSION)
+GO_PKG_LDFLAGS_X:=github.com/netbirdio/netbird/version.version=$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
@@ -44,6 +44,10 @@ ifneq ($(CONFIG_NETBIRD_COMPRESS_UPX),)
 endif
 endef
 
+define Package/netbird/conffiles
+/etc/netbird/config.json
+endef
+
 define Package/netbird/install
 	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))