openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: tidb 3.0.0.20190119 -> 3.0.5.20191124

master
Dr. Ralf S. Engelschall 6 years ago
parent
caf5990cb2
commit
deab59b74e
2 changed files with 40 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 65
      tidb/tidb.patch
  2. 9
      tidb/tidb.spec

65
tidb/tidb.patch
Unescape View File

@ -1,18 +1,18 @@
Index: src/github.com/pingcap/tidb/Makefile Index: src/github.com/pingcap/tidb/Makefile
--- src/github.com/pingcap/tidb/Makefile.orig 2019-01-19 10:25:21.000000000 +0100 --- src/github.com/pingcap/tidb/Makefile.orig 2019-11-24 17:00:06.000000000 +0100
+++ src/github.com/pingcap/tidb/Makefile 2019-01-19 10:34:32.014985000 +0100 +++ src/github.com/pingcap/tidb/Makefile 2019-11-24 17:07:31.987438000 +0100
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
path_to_add := $(addsuffix /bin,$(subst :,/bin:,$(GOPATH))) path_to_add := $(addsuffix /bin,$(subst :,/bin:,$(GOPATH))):$(PWD)/tools/bin
export PATH := $(path_to_add):$(PATH) export PATH := $(path_to_add):$(PATH)
-GO := GO111MODULE=on go -GO := GO111MODULE=on go
+GO := go +GO := go
GOBUILD := CGO_ENABLED=1 $(GO) build $(BUILD_FLAG) GOBUILD := $(GO) build $(BUILD_FLAG) -tags codes
GOTEST := CGO_ENABLED=1 $(GO) test -p 3 GOBUILDCOVERAGE := GOPATH=$(GOPATH) cd tidb-server; $(GO) test -coverpkg="../..." -c .
OVERALLS := CGO_ENABLED=1 GO111MODULE=on overalls GOTEST := $(GO) test -p 8
@@ -29,8 +29,8 @@ @@ -30,8 +30,8 @@
LDFLAGS += -X "github.com/pingcap/parser/mysql.TiDBReleaseVersion=$(shell git describe --tags --dirty)" LDFLAGS += -X "github.com/pingcap/parser/mysql.TiDBReleaseVersion=$(shell git describe --tags --dirty --always)"
LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBBuildTS=$(shell date -u '+%Y-%m-%d %I:%M:%S')" LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBBuildTS=$(shell date -u '+%Y-%m-%d %I:%M:%S')"
-LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitHash=$(shell git rev-parse HEAD)" -LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitHash=$(shell git rev-parse HEAD)"
-LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitBranch=$(shell git rev-parse --abbrev-ref HEAD)" -LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitBranch=$(shell git rev-parse --abbrev-ref HEAD)"
@ -21,7 +21,7 @@ Index: src/github.com/pingcap/tidb/Makefile
LDFLAGS += -X "github.com/pingcap/tidb/util/printer.GoVersion=$(shell go version)" LDFLAGS += -X "github.com/pingcap/tidb/util/printer.GoVersion=$(shell go version)"
TEST_LDFLAGS = -X "github.com/pingcap/tidb/config.checkBeforeDropLDFlag=1" TEST_LDFLAGS = -X "github.com/pingcap/tidb/config.checkBeforeDropLDFlag=1"
@@ -71,7 +71,6 @@ @@ -78,7 +78,6 @@
@gofmt -s -l -w $(FILES) 2>&1 | $(FAIL_ON_STDOUT) @gofmt -s -l -w $(FILES) 2>&1 | $(FAIL_ON_STDOUT)
goword:tools/bin/goword goword:tools/bin/goword
@ -29,8 +29,8 @@ Index: src/github.com/pingcap/tidb/Makefile
gosec:tools/bin/gosec gosec:tools/bin/gosec
tools/bin/gosec $$($(PACKAGE_DIRECTORIES)) tools/bin/gosec $$($(PACKAGE_DIRECTORIES))
@@ -94,12 +93,8 @@ @@ -106,12 +105,8 @@
@GO111MODULE=on tools/bin/errcheck -exclude ./tools/check/errcheck_excludes.txt -blank $(PACKAGES) | grep -v "_test\.go" | awk '{print} END{if(NR>0) {exit 1}}' ./tools/check/check-gogenerate.sh
lint:tools/bin/revive lint:tools/bin/revive
- @echo "linting" - @echo "linting"
@ -38,39 +38,44 @@ Index: src/github.com/pingcap/tidb/Makefile
vet: vet:
- @echo "vet" - @echo "vet"
- $(GO) vet -all -shadow $(PACKAGES) 2>&1 | $(FAIL_ON_STDOUT) - $(GO) vet -all $(PACKAGES) 2>&1 | $(FAIL_ON_STDOUT)
tidy: tidy:
@echo "go mod tidy" @echo "go mod tidy"
@@ -123,31 +118,12 @@ @@ -142,36 +137,12 @@
endif endif
gotest: gofail-enable gotest: failpoint-enable
-ifeq ("$(TRAVIS_COVERAGE)", "1") -ifeq ("$(TRAVIS_COVERAGE)", "1")
- @echo "Running in TRAVIS_COVERAGE mode." - @echo "Running in TRAVIS_COVERAGE mode."
- @export log_level=error; \
- $(GO) get github.com/go-playground/overalls - $(GO) get github.com/go-playground/overalls
- $(OVERALLS) -project=github.com/pingcap/tidb -covermode=count -ignore='.git,vendor,cmd,docs,LICENSES' -concurrency=1 || { $(GOFAIL_DISABLE); exit 1; } - @export log_level=error; \
- $(OVERALLS) -project=github.com/pingcap/tidb \
- -covermode=count \
- -ignore='.git,vendor,cmd,docs,LICENSES' \
- -concurrency=4 \
- -- -coverpkg=./... \
- || { $(FAILPOINT_DISABLE); exit 1; }
-else -else
- @echo "Running in native mode." - @echo "Running in native mode."
- @export log_level=error; \ - @export log_level=error; export TZ='Asia/Shanghai'; \
- $(GOTEST) -ldflags '$(TEST_LDFLAGS)' -cover $(PACKAGES) || { $(GOFAIL_DISABLE); exit 1; } - $(GOTEST) -ldflags '$(TEST_LDFLAGS)' -cover $(PACKAGES) -check.timeout 4s || { $(FAILPOINT_DISABLE); exit 1; }
-endif -endif
- @$(GOFAIL_DISABLE) - @$(FAILPOINT_DISABLE)
race: gofail-enable race: failpoint-enable
- @export log_level=debug; \ - @export log_level=debug; \
- $(GOTEST) -timeout 20m -race $(PACKAGES) || { $(GOFAIL_DISABLE); exit 1; } - $(GOTEST) -timeout 20m -race $(PACKAGES) || { $(FAILPOINT_DISABLE); exit 1; }
- @$(GOFAIL_DISABLE) - @$(FAILPOINT_DISABLE)
leak: gofail-enable leak: failpoint-enable
- @export log_level=debug; \ - @export log_level=debug; \
- $(GOTEST) -tags leak $(PACKAGES) || { $(GOFAIL_DISABLE); exit 1; } - $(GOTEST) -tags leak $(PACKAGES) || { $(FAILPOINT_DISABLE); exit 1; }
- @$(GOFAIL_DISABLE) - @$(FAILPOINT_DISABLE)
tikv_integration_test: gofail-enable tikv_integration_test: failpoint-enable
- $(GOTEST) ./store/tikv/. -with-tikv=true || { $(GOFAIL_DISABLE); exit 1; } - $(GOTEST) ./store/tikv/. -with-tikv=true || { $(FAILPOINT_DISABLE); exit 1; }
- @$(GOFAIL_DISABLE) - @$(FAILPOINT_DISABLE)
RACE_FLAG = RACE_FLAG =
ifeq ("$(WITH_RACE)", "1") ifeq ("$(WITH_RACE)", "1")

9
tidb/tidb.spec
Unescape View File

@ -22,9 +22,9 @@
## ##
# package information # package information
%define V_tidb_opkg 3.0.0 %define V_tidb_opkg 3.0.5
%define V_tidb_base 3.0.0 %define V_tidb_base 3.0.5
%define V_tidb_snap 20190119 %define V_tidb_snap 20191124
# package information # package information
Name: tidb Name: tidb
@ -37,7 +37,7 @@ Class: EVAL
Group: Database Group: Database
License: Apache License: Apache
Version: %{V_tidb_opkg}.%{V_tidb_snap} Version: %{V_tidb_opkg}.%{V_tidb_snap}
Release: 20190119 Release: 20191124
# list of sources # list of sources
Source0: http://download.openpkg.org/components/versioned/tidb/tidb-%{V_tidb_snap}.tar.xz Source0: http://download.openpkg.org/components/versioned/tidb/tidb-%{V_tidb_snap}.tar.xz
@ -82,6 +82,7 @@ PreReq: OpenPKG, openpkg >= 20160101
go build -v -o golex *.go go build -v -o golex *.go
) || exit $? ) || exit $?
PATH=$GOPATH/src/github.com/pingcap/goyacc:$GOPATH/src/github.com/qiuyesuifeng/golex:$PATH PATH=$GOPATH/src/github.com/pingcap/goyacc:$GOPATH/src/github.com/qiuyesuifeng/golex:$PATH
rm -rf $GOPATH/src/go.etcd.io/etcd/clientv3
( cd $GOPATH/src/github.com/pingcap/tidb ( cd $GOPATH/src/github.com/pingcap/tidb
%{l_make} %{l_mflags} BUILD_FLAG=-v %{l_make} %{l_mflags} BUILD_FLAG=-v
%{l_make} %{l_mflags} BUILD_FLAG=-v server %{l_make} %{l_mflags} BUILD_FLAG=-v server

Write Preview
Loading…
Cancel
Save