Compare commits

..

No commits in common. "d9d552ed0716d21a8d96ba877dbae370b9e7c1a9" and "94fb4bcafb0982381dbecc6dc6c068bc050c825c" have entirely different histories.

5 changed files with 3 additions and 4175 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,42 +0,0 @@
From 3c62ba67a1cbb55636567909f6389e89fe6db7e8 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
Date: Mon, 11 Oct 2021 11:04:49 +0800
Subject: [PATCH] fix release version
---
Makefile | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index c36dc47..24ec57e 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,10 @@ GOTEST := $(GO) test -p $(P)
OVERALLS := GO111MODULE=on overalls
STATICCHECK := GO111MODULE=on staticcheck
TIDB_EDITION ?= Community
+RELEASE_VERSION ?= v4.0.14
+TIDB_BUILDTS ?= None
+TIDB_GITHASH ?= None
+TIDB_GITBRANCH ?= None
# Ensure TIDB_EDITION is set to Community or Enterprise before running build process.
ifneq "$(TIDB_EDITION)" "Community"
@@ -51,10 +55,10 @@ FILES := $$(find $$($(PACKAGE_DIRECTORIES)) -name "*.go")
FAILPOINT_ENABLE := $$(find $$PWD/ -type d | grep -vE "(\.git|tools)" | xargs tools/bin/failpoint-ctl enable)
FAILPOINT_DISABLE := $$(find $$PWD/ -type d | grep -vE "(\.git|tools)" | xargs tools/bin/failpoint-ctl disable)
-LDFLAGS += -X "github.com/pingcap/parser/mysql.TiDBReleaseVersion=$(shell git describe --tags --dirty --always)"
-LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBBuildTS=$(shell date -u '+%Y-%m-%d %I:%M:%S')"
-LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBGitHash=$(shell git rev-parse HEAD)"
-LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBGitBranch=$(shell git rev-parse --abbrev-ref HEAD)"
+LDFLAGS += -X "github.com/pingcap/parser/mysql.TiDBReleaseVersion=$(RELEASE_VERSION)"
+LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBBuildTS=$(TIDB_BUILDTS)"
+LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBGitHash=$(TIDB_GITHASH)"
+LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBGitBranch=$(TIDB_GITBRANCH)"
LDFLAGS += -X "github.com/pingcap/tidb/util/versioninfo.TiDBEdition=$(TIDB_EDITION)"
TEST_LDFLAGS = -X "github.com/pingcap/tidb/config.checkBeforeDropLDFlag=1"
--
2.27.0

File diff suppressed because it is too large Load Diff

View File

@ -1,12 +0,0 @@
diff -ur tidb-4.0.14/util/sys/linux/sys_linux.go tidb-4.0.14/util/sys/linux/sys_linux.go
--- tidb-4.0.14/util/sys/linux/sys_linux.go 2021-07-26 18:50:15.000000000 +0800
+++ tidb-4.0.14/util/sys/linux/sys_linux.go 2023-07-19 09:54:54.386949713 +0800
@@ -27,7 +27,7 @@
if err != nil {
return
}
- charsToString := func(ca []int8) string {
+ charsToString := func(ca []uint8) string {
s := make([]byte, len(ca))
var lens int
for ; lens < len(ca); lens++ {

View File

@ -1,9 +1,9 @@
Name: tidb Name: tidb
Version: 4.0.14 Version: 4.0.14
Release: 6 Release: 2
Summary: TiDB is a distributed NewSQL database compatible with MySQL protocol Summary: TiDB is a distributed NewSQL database compatible with MySQL protocol
License: Apache 2.0 License: QL and STRUTIL
URL: https://github.com/pingcap/tidb URL: https://github.com/pingcap/tidb
Source0: https://github.com/pingcap/tidb/archive/refs/tags/v4.0.14.tar.gz Source0: https://github.com/pingcap/tidb/archive/refs/tags/v4.0.14.tar.gz
Source1: tidb-server.service Source1: tidb-server.service
@ -11,11 +11,6 @@ Source2: tidb-server.toml
#Go mod for non-extranet environments #Go mod for non-extranet environments
Source3: vendor.tar.gz Source3: vendor.tar.gz
Patch0: Set-GOFLAG-to-go-mod-vendor.patch Patch0: Set-GOFLAG-to-go-mod-vendor.patch
Patch1: 0001-fix-release-version.patch
Patch2: add-riscv-support.patch
Patch3: add-riscv-support-for-vendor.patch
Patch4: 0001-add-loong64-support.patch
BuildRequires: golang >= 1.10.0 BuildRequires: golang >= 1.10.0
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires(post): systemd Requires(post): systemd
@ -24,19 +19,8 @@ Requires(post): systemd
TiDB is a distributed NewSQL database compatible with MySQL protocol TiDB is a distributed NewSQL database compatible with MySQL protocol
%prep %prep
%setup -q %autosetup -p1
%patch -P 0 -p1
%patch -P 1 -p1
%ifarch riscv64
%patch -P 2 -p1
%endif
tar xvf %{SOURCE3} -C . tar xvf %{SOURCE3} -C .
%ifarch riscv64
%patch -P 3
%endif
%ifarch loongarch64
%patch -P 4 -p1
%endif
%build %build
%make_build %make_build
@ -84,18 +68,6 @@ exit 0
%license LICENSE %license LICENSE
%changelog %changelog
* Tue Dec 17 2024 shenzhongwei <shenzhongwei@kylinos.cn> - 4.0.14-6
- include all patches in the source package.
* Mon Jul 01 2024 zhangxianting <zhangxianting@uniontech.com> - 4.0.14-5
- add loongarch64 support
* Mon Jul 17 2023 zhangxiang <zhangxiang@iscas.ac.cn> - 4.0.14-4
- add riscv64 support
* Mon Oct 11 2021 baizhonggui <baizhonggui@huawei.com> - 4.0.14-3
- Fix commond tidb-server -V 'Release Version' not displayed
* Thu Sep 02 2021 sunguoshuai <sunguoshuai@huawei.com> - 4.0.14-2 * Thu Sep 02 2021 sunguoshuai <sunguoshuai@huawei.com> - 4.0.14-2
- Fix tidb-server.service start failure - Fix tidb-server.service start failure