From 89c20883ab950c55720133549736f749db546d50 Mon Sep 17 00:00:00 2001 From: gotlium Date: Tue, 23 Aug 2016 01:42:45 +0500 Subject: [PATCH] build fixes --- Makefile | 4 ++-- VERSION | 2 +- helpers/backends/backend.go | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d16fb2d..e323e34 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ LAST_TAG := $(shell git describe --tags --abbrev=0) COMGPLv3S := $(shell echo `git log --oneline $(LAST_TAG)..HEAD | wc -l`) VERSION := $(shell (cat VERSION || echo dev) | sed -e 's/^v//g') ifneq ($(RELEASE),true) - VERSION := $(shell echo $(VERSION)~beta.$(COMGPLv3S).g$(REVISION)) + VERSION := $(shell echo $(VERSION).$(COMGPLv3S).g$(REVISION)) endif ITTERATION := $(shell date +%s) BUILD_PLATFORMS ?= -os="linux" @@ -62,7 +62,7 @@ toolchain: build: gox $(BUILD_PLATFORMS) \ - -ldflags "-X main.NAME $(PACKAGE_NAME) -X main.VERSION $(VERSION) -X main.REVISION $(REVISION)" \ + -ldflags "-X main.NAME=$(PACKAGE_NAME) -X main.VERSION=$(VERSION) -X main.REVISION=$(REVISION)" \ -output="out/binaries/$(NAME)-{{.OS}}-{{.Arch}}" lint: diff --git a/VERSION b/VERSION index 24cffb8..b0c101e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.26 +1.27 diff --git a/helpers/backends/backend.go b/helpers/backends/backend.go index 1b5c2a2..33d9056 100644 --- a/helpers/backends/backend.go +++ b/helpers/backends/backend.go @@ -3,8 +3,8 @@ package backends import ( "github.com/LPgenerator/Ldld/helpers/backends/zfs" "github.com/LPgenerator/Ldld/helpers/backends/btrfs" - "github.com/LPgenerator/Ldld/helpers/backends/overlayfs" - "github.com/LPgenerator/Ldld/helpers/backends/lvm" + //"github.com/LPgenerator/Ldld/helpers/backends/overlayfs" + //"github.com/LPgenerator/Ldld/helpers/backends/lvm" ) @@ -29,11 +29,13 @@ func New(backend string) (Fs) { if backend == "btrfs" { fs = []Fs{btrfs.Btrfs{}} } + /* if backend == "overlayfs" { fs = []Fs{overlayfs.Overlayfs{}} } if backend == "lvm" { fs = []Fs{lvm.Lvm{}} } + */ return fs[0] }