Skip to content

GitLab

M
mender
Commit df336149 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated mender to 2.6.0

parent 8c3beeff
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 6 deletions
Makefile
View file @ df336149
all: mender.conf all: mender.conf
mkdir -p ../go/go/src/github.com/mendersoftware mkdir -p ../go/go/src/github.com/mendersoftware
mkdir -p /tmp/gocache mkdir -p /tmp/gocache
tar xf mender-2.2.0.tar.gz -C ../go/go/src/github.com/mendersoftware tar xf mender-2.6.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 patch -Np1 -d ../go/go/src/github.com/mendersoftware/mender-2.6.0 < mender-2.6.0-fix_version.patch
cd ../go/go/src/github.com/mendersoftware/mender && GOCACHE=/tmp/gocache GOPATH=$$(pwd)/../../../.. ../../../../bin/go mod init 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.2.0" # 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 && $(MAKE) install 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 @echo "$$MENDER_CONF" > /etc/mender/mender.conf
cp -r /build/packages/artifactscripts /etc/mender cp -r /build/packages/artifactscripts /etc/mender
chmod +x /etc/mender/artifactscripts/* chmod +x /etc/mender/artifactscripts/*
...@@ -16,7 +16,7 @@ all: mender.conf ...@@ -16,7 +16,7 @@ all: mender.conf
@echo "artifact_name=$(ARTIFACT_NAME)-$(BUILD_ID)" > /etc/mender/artifact_info @echo "artifact_name=$(ARTIFACT_NAME)-$(BUILD_ID)" > /etc/mender/artifact_info
mkdir -p -m 700 /var/lib/mender mkdir -p -m 700 /var/lib/mender
@echo "device_type=$(DEVICE_TYPE)" > /var/lib/mender/device_type @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 /tmp/gocache
rm -rf ../go/go/src/github.com/mendersoftware rm -rf ../go/go/src/github.com/mendersoftware
......
mender-2.6.0-fix_version.patch 0 → 100644
View file @ df336149
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)"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment