From bc7b24bd9c7639e79780dba79dcdccbc2a00f856 Mon Sep 17 00:00:00 2001 From: tongkunkun Date: Thu, 24 Nov 2022 18:22:19 +0800 Subject: [PATCH 1/4] add patch Signed-off-by: tongkunkun --- ...y-the-malformed-space-in-code-format.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 0001-bdev-modify-the-malformed-space-in-code-format.patch diff --git a/0001-bdev-modify-the-malformed-space-in-code-format.patch b/0001-bdev-modify-the-malformed-space-in-code-format.patch new file mode 100644 index 0000000..8277df5 --- /dev/null +++ b/0001-bdev-modify-the-malformed-space-in-code-format.patch @@ -0,0 +1,30 @@ +From d024e1ca9209b6ff8642aa4519789008a4bdfabf Mon Sep 17 00:00:00 2001 +From: tongkunkun +Date: Thu, 24 Nov 2022 17:06:25 +0800 +Subject: [PATCH] bdev: modify the malformed space in code format + +replace the malformed space to tab + +Signed-off-by: tongkunkun +--- + lib/bdev/bdev.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c +index 2a642d6..511b499 100644 +--- a/lib/bdev/bdev.c ++++ b/lib/bdev/bdev.c +@@ -3578,8 +3578,8 @@ spdk_bdev_read(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, + + int + spdk_bdev_read_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, +- void *buf, uint64_t offset_blocks, uint64_t num_blocks, +- spdk_bdev_io_completion_cb cb, void *cb_arg) ++ void *buf, uint64_t offset_blocks, uint64_t num_blocks, ++ spdk_bdev_io_completion_cb cb, void *cb_arg) + { + return bdev_read_blocks_with_md(desc, ch, buf, NULL, offset_blocks, num_blocks, cb, cb_arg); + } +-- +2.37.2.windows.2 + -- Gitee From 271e60d314d0bee1edbc53bde8c9626580854d5f Mon Sep 17 00:00:00 2001 From: tongkunkun Date: Thu, 24 Nov 2022 18:34:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkunkun --- ...030-bdev-modify-the-malformed-space-in-code-format.patch | 0 spdk.spec | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) rename 0001-bdev-modify-the-malformed-space-in-code-format.patch => 0030-bdev-modify-the-malformed-space-in-code-format.patch (100%) diff --git a/0001-bdev-modify-the-malformed-space-in-code-format.patch b/0030-bdev-modify-the-malformed-space-in-code-format.patch similarity index 100% rename from 0001-bdev-modify-the-malformed-space-in-code-format.patch rename to 0030-bdev-modify-the-malformed-space-in-code-format.patch diff --git a/spdk.spec b/spdk.spec index a90ce79..7b1305f 100644 --- a/spdk.spec +++ b/spdk.spec @@ -4,7 +4,7 @@ Name: spdk Version: 21.01.1 -Release: 7 +Release: 8 Summary: Set of libraries and utilities for high performance user-mode storage License: BSD and MIT URL: http://spdk.io @@ -38,6 +38,7 @@ Patch26: 0026-Fix-race-condition-in-continuous-setup-and-teardown-.patch Patch27: 0027-Change-log-level-in-poll-timeout.patch Patch28: 0028-configure-add-CONFIG_HAVE_ARC4RANDOM.patch Patch29: 0029-Enable-unittest-in-make-check.patch +Patch30: 0030-bdev-modify-the-malformed-space-in-code-format.patch %define package_version %{version}-%{release} @@ -212,6 +213,9 @@ mv doc/output/html/ %{install_docdir} %changelog +* Thu Nov 241 2022 Tongkunkun - 21.01.1-8 +- replace the malformed space to tab + * Tue Nov 1 2022 Weifeng Su - 21.01.1-7 - Enable unittest -- Gitee From 43dfe3a169191879c86e5e91742a10922ea47436 Mon Sep 17 00:00:00 2001 From: tongkunkun Date: Fri, 25 Nov 2022 11:04:20 +0800 Subject: [PATCH 3/4] Add deploy shell script add deploy.sh Signed-off-by: tongkunkun --- deploy.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 deploy.sh diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..99ec7fe --- /dev/null +++ b/deploy.sh @@ -0,0 +1,10 @@ +mkdir -p /data/spdk-tmp +cp spdk-21.01.1 /data/spdk-tmp +cd /data/spdk-tmp +tar -xzvf v21.01.1.tar.gz +cp *.patch spdk-21.01.1/ +cd spdk-21.01.1 +git init +git add . +git commit -s + -- Gitee From f5851b5fb2ea9f0720ebd554c713376def65ba32 Mon Sep 17 00:00:00 2001 From: tongkunkun Date: Fri, 25 Nov 2022 11:06:48 +0800 Subject: [PATCH 4/4] add deploy.sh Signed-off-by: tongkunkun --- 0030-Add-deploy-shell-script.patch | 32 ++++++++++++++++++++++++++++++ spdk.spec | 4 ++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 0030-Add-deploy-shell-script.patch diff --git a/0030-Add-deploy-shell-script.patch b/0030-Add-deploy-shell-script.patch new file mode 100644 index 0000000..5e46db0 --- /dev/null +++ b/0030-Add-deploy-shell-script.patch @@ -0,0 +1,32 @@ +From 43dfe3a169191879c86e5e91742a10922ea47436 Mon Sep 17 00:00:00 2001 +From: tongkunkun +Date: Fri, 25 Nov 2022 11:04:20 +0800 +Subject: [PATCH] Add deploy shell script + +add deploy.sh + +Signed-off-by: tongkunkun +--- + deploy.sh | 10 ++++++++++ + 1 file changed, 10 insertions(+) + create mode 100644 deploy.sh + +diff --git a/deploy.sh b/deploy.sh +new file mode 100644 +index 0000000..99ec7fe +--- /dev/null ++++ b/deploy.sh +@@ -0,0 +1,10 @@ ++mkdir -p /data/spdk-tmp ++cp spdk-21.01.1 /data/spdk-tmp ++cd /data/spdk-tmp ++tar -xzvf v21.01.1.tar.gz ++cp *.patch spdk-21.01.1/ ++cd spdk-21.01.1 ++git init ++git add . ++git commit -s ++ +-- +2.37.2.windows.2 + diff --git a/spdk.spec b/spdk.spec index 7b1305f..35ce57c 100644 --- a/spdk.spec +++ b/spdk.spec @@ -213,8 +213,8 @@ mv doc/output/html/ %{install_docdir} %changelog -* Thu Nov 241 2022 Tongkunkun - 21.01.1-8 -- replace the malformed space to tab +* Thu Nov 24 2022 Tongkunkun - 21.01.1-8 +- Add deploy shell file * Tue Nov 1 2022 Weifeng Su - 21.01.1-7 - Enable unittest -- Gitee