Updated mender to 2.6.0

Makefile

 all: mender.conf
 	mkdir -p ../go/go/src/github.com/mendersoftware
 	mkdir -p /tmp/gocache
-	tar xf mender-2.2.0.tar.gz -C ../go/go/src/github.com/mendersoftware
-	mv ../go/go/src/github.com/mendersoftware/mender-2.2.0 ../go/go/src/github.com/mendersoftware/mender
-	cd ../go/go/src/github.com/mendersoftware/mender && GOCACHE=/tmp/gocache GOPATH=$$(pwd)/../../../.. ../../../../bin/go mod init
-	cd ../go/go/src/github.com/mendersoftware/mender && GOCACHE=/tmp/gocache GOPATH=$$(pwd)/../../../.. ../../../../bin/go build -ldflags "-X github.com/mendersoftware/mender/conf.Version=2.2.0"
-	cd ../go/go/src/github.com/mendersoftware/mender && $(MAKE) install
+	tar xf mender-2.6.0.tar.gz -C ../go/go/src/github.com/mendersoftware
+	patch -Np1 -d ../go/go/src/github.com/mendersoftware/mender-2.6.0 < mender-2.6.0-fix_version.patch
+	mv ../go/go/src/github.com/mendersoftware/mender-2.6.0 ../go/go/src/github.com/mendersoftware/mender
+#	cd ../go/go/src/github.com/mendersoftware/mender && GOCACHE=/tmp/gocache GOPATH=$$(pwd)/../../../.. ../../../../bin/go build -ldflags "-X github.com/mendersoftware/mender/conf.Version=2.6.0"
+	cd ../go/go/src/github.com/mendersoftware/mender && GOCACHE=/tmp/gocache GOPATH=$$(pwd)/../../../.. GO=$$(pwd)/../../../../bin/go $(MAKE) install
 	@echo "$$MENDER_CONF" > /etc/mender/mender.conf
 	cp -r /build/packages/artifactscripts /etc/mender
 	chmod +x /etc/mender/artifactscripts/*
@@ -16,7 +16,7 @@ all: mender.conf
 	@echo "artifact_name=$(ARTIFACT_NAME)-$(BUILD_ID)" > /etc/mender/artifact_info
 	mkdir -p -m 700 /var/lib/mender
 	@echo "device_type=$(DEVICE_TYPE)" > /var/lib/mender/device_type
-	systemctl enable mender.service
+	systemctl enable mender-client.service
 	rm -rf /tmp/gocache
 	rm -rf ../go/go/src/github.com/mendersoftware
 

mender-2.6.0-fix_version.patch

+diff -uNr mender-2.6.0/Makefile mender-2.6.0-fix_version/Makefile
+--- mender-2.6.0/Makefile	2021-04-08 23:29:25.000000000 +0930
++++ mender-2.6.0-fix_version/Makefile	2022-11-08 20:23:48.366376480 +1030
+@@ -28,7 +28,7 @@
+ 	github.com/mendersoftware/deadcode \
+ 	github.com/mendersoftware/gobinarycoverage
+ 
+-VERSION = $(shell git describe --tags --dirty --exact-match 2>/dev/null || git rev-parse --short HEAD)
++VERSION = 2.6.0
+ 
+ GO_LDFLAGS = \
+ 	-ldflags "-X github.com/mendersoftware/mender/conf.Version=$(VERSION)"