From 95c6a55bb0e1d530e3e6466dadbeb794d0fd968c Mon Sep 17 00:00:00 2001
From: Siyuan Miao <i@xswan.net>
Date: Sun, 24 Aug 2025 19:29:21 +0200
Subject: [PATCH] resolve conflicts

---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 461a137..5c54dbc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ BRANCH    ?= $(shell git rev-parse --abbrev-ref HEAD)
 BUILDDATE ?= $(shell date -u +%FT%T%z)
 BUILDTS   ?= $(shell date -u +%s)
 REVISION  ?= $(shell git rev-parse HEAD)
-VERSION_DEV := 0.4.5-dev$(shell date +%Y%m%d%H%M)
-VERSION := 0.4.4
+VERSION_DEV ?= 0.4.7-dev$(shell date +%Y%m%d%H%M)
+VERSION ?= 0.4.6
 
 PROMETHEUS_TAG := github.com/prometheus/common/version
 KVM_PKG_NAME := github.com/jetkvm/kvm
@@ -11,7 +11,9 @@ KVM_PKG_NAME := github.com/jetkvm/kvm
 BUILDKIT_FLAVOR := arm-rockchip830-linux-uclibcgnueabihf
 BUILDKIT_PATH ?= /opt/jetkvm-native-buildkit
 
-GO_BUILD_ARGS := -tags netgo
+
+GO_BUILD_ARGS := -tags netgo -tags timetzdata
+
 GO_RELEASE_BUILD_ARGS := -trimpath $(GO_BUILD_ARGS)
 GO_LDFLAGS := \
   -s -w \