You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
106 lines
5.2 KiB
106 lines
5.2 KiB
Index: src/github.com/hyperledger/fabric/Makefile |
|
--- src/github.com/hyperledger/fabric/Makefile.orig 2019-01-26 10:42:33.000000000 +0100 |
|
+++ src/github.com/hyperledger/fabric/Makefile 2019-01-26 10:43:12.061223000 +0100 |
|
@@ -61,8 +61,8 @@ |
|
BUILD_DIR ?= .build |
|
NEXUS_REPO = nexus3.hyperledger.org:10001/hyperledger |
|
|
|
-EXTRA_VERSION ?= $(shell git rev-parse --short HEAD) |
|
-PROJECT_VERSION=$(BASE_VERSION)-snapshot-$(EXTRA_VERSION) |
|
+EXTRA_VERSION ?= |
|
+PROJECT_VERSION=$(BASE_VERSION)-snapshot |
|
|
|
PKGNAME = github.com/$(PROJECT_NAME) |
|
CGO_FLAGS = CGO_CFLAGS=" " |
|
@@ -85,17 +85,15 @@ |
|
|
|
export GO_LDFLAGS GO_TAGS |
|
|
|
-EXECUTABLES ?= go docker git curl |
|
+EXECUTABLES ?= go |
|
K := $(foreach exec,$(EXECUTABLES),\ |
|
$(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH: Check dependencies"))) |
|
|
|
GOSHIM_DEPS = $(shell ./scripts/goListFiles.sh $(PKGNAME)/core/chaincode/shim) |
|
-PROTOS = $(shell git ls-files *.proto | grep -Ev 'vendor/|testdata/') |
|
+PROTOS = |
|
# No sense rebuilding when non production code is changed |
|
-PROJECT_FILES = $(shell git ls-files | grep -v ^test | grep -v ^unit-test | \ |
|
- grep -v ^.git | grep -v ^examples | grep -v ^devenv | grep -v .png$ | \ |
|
- grep -v ^LICENSE | grep -v ^vendor ) |
|
-RELEASE_TEMPLATES = $(shell git ls-files | grep "release/templates") |
|
+PROJECT_FILES = |
|
+RELEASE_TEMPLATES = |
|
IMAGES = peer orderer ccenv buildenv tools |
|
RELEASE_PLATFORMS = windows-amd64 darwin-amd64 linux-amd64 linux-s390x linux-ppc64le |
|
RELEASE_PKGS = configtxgen cryptogen idemixgen discover configtxlator peer orderer |
|
@@ -259,7 +257,7 @@ |
|
$(BUILD_DIR)/bin/%: $(PROJECT_FILES) |
|
@mkdir -p $(@D) |
|
@echo "$@" |
|
- $(CGO_FLAGS) GOBIN=$(abspath $(@D)) go install -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
+ $(CGO_FLAGS) GOBIN=$(abspath $(@D)) go install -v -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
@echo "Binary available as $@" |
|
@touch $@ |
|
|
|
@@ -352,41 +350,41 @@ |
|
release/%/bin/configtxlator: $(PROJECT_FILES) |
|
@echo "Building $@ for $(GOOS)-$(GOARCH)" |
|
mkdir -p $(@D) |
|
- $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
+ $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -v -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
|
|
release/%/bin/configtxgen: $(PROJECT_FILES) |
|
@echo "Building $@ for $(GOOS)-$(GOARCH)" |
|
mkdir -p $(@D) |
|
- $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
+ $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -v -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
|
|
release/%/bin/cryptogen: $(PROJECT_FILES) |
|
@echo "Building $@ for $(GOOS)-$(GOARCH)" |
|
mkdir -p $(@D) |
|
- $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
+ $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -v -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
|
|
release/%/bin/idemixgen: $(PROJECT_FILES) |
|
@echo "Building $@ for $(GOOS)-$(GOARCH)" |
|
mkdir -p $(@D) |
|
- $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
+ $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -v -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
|
|
release/%/bin/discover: $(PROJECT_FILES) |
|
@echo "Building $@ for $(GOOS)-$(GOARCH)" |
|
mkdir -p $(@D) |
|
- $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
+ $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -v -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
|
|
release/%/bin/orderer: GO_LDFLAGS = $(patsubst %,-X $(PKGNAME)/common/metadata.%,$(METADATA_VAR)) |
|
|
|
release/%/bin/orderer: $(PROJECT_FILES) |
|
@echo "Building $@ for $(GOOS)-$(GOARCH)" |
|
mkdir -p $(@D) |
|
- $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
+ $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -v -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
|
|
release/%/bin/peer: GO_LDFLAGS = $(patsubst %,-X $(PKGNAME)/common/metadata.%,$(METADATA_VAR)) |
|
|
|
release/%/bin/peer: $(PROJECT_FILES) |
|
@echo "Building $@ for $(GOOS)-$(GOARCH)" |
|
mkdir -p $(@D) |
|
- $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
+ $(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -v -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F)) |
|
|
|
release/%/install: $(PROJECT_FILES) |
|
mkdir -p $(@D)/bin |
|
Index: src/github.com/hyperledger/fabric/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go |
|
--- src/github.com/hyperledger/fabric/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2019-01-26 10:42:33.000000000 +0100 |
|
+++ src/github.com/hyperledger/fabric/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go 2019-01-26 10:46:05.893580000 +0100 |
|
@@ -37,7 +37,7 @@ |
|
|
|
if filter != nil { |
|
// filter out entries we're not interested in |
|
- skip, stop = filter(p) |
|
+ skip, stop = filter(&mountinfo) |
|
if skip { |
|
continue |
|
}
|
|
|