update spdk to 25.05

This commit is contained in:
Lierfang Support Team 2025-06-26 16:28:05 +08:00
parent 6b6bd1762b
commit ee6ec06e81
5 changed files with 9 additions and 35 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
pxvirt-spdk (25.05) bookworm; urgency=medium
* update spdk to 25.05
-- Jiangcuo <Jiangcuo@lierfang.com> Thu, 26 Jun 2025 13:56:49 +0800
pxvirt-spdk (24.09) bookworm; urgency=medium
* init

View File

@ -1,33 +0,0 @@
diff --git a/dpdkbuild/Makefile b/dpdkbuild/Makefile
index 64da6cc32..56897cbe4 100644
--- a/dpdkbuild/Makefile
+++ b/dpdkbuild/Makefile
@@ -11,6 +11,8 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DPDK_OPTS = -Denable_docs=false
DPDK_OPTS += -Dtests=false
+DPDK_OPTS += -Dplatform=generic
+
ifeq ($(shell uname -m),aarch64)
ifeq ($(shell uname -p),unknown)
diff --git a/dpdk/config/x86/meson.build b/dpdk/config/x86/meson.build
index 8087b9ae91..a236a316dd 100644
--- a/dpdk/config/x86/meson.build
+++ b/dpdk/config/x86/meson.build
@@ -50,15 +50,6 @@ optional_flags = [
'AES',
'AVX',
'AVX2',
- 'AVX512BW',
- 'AVX512CD',
- 'AVX512DQ',
- 'AVX512F',
- 'AVX512VL',
- 'PCLMUL',
- 'RDRND',
- 'RDSEED',
- 'VPCLMULQDQ',
]
foreach f:optional_flags
if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'

View File

@ -1,3 +1,2 @@
001-fix-autoclean-on-first-build.patch
002-fix-spdk_setup-rootdir-path.patch
003-build-for-generic.patch

2
debian/rules vendored
View File

@ -76,6 +76,8 @@ override_dh_auto_install:
# install spdk scripts
mkdir $(CURDIR)/debian/python3-spdk/usr/share/spdk -p
cp -r $(CURDIR)/scripts $(CURDIR)/debian/python3-spdk/usr/share/spdk/
cp -r $(CURDIR)/scripts/rpc.py $(CURDIR)/debian/pxvirt-spdk/usr/bin/spdk_rpc
cp -r $(CURDIR)/scripts/spdkcli.py $(CURDIR)/debian/pxvirt-spdk/usr/bin/spdk_cli
# install spdk_setup
install -Dm644 "scripts/bash-completion/spdk" $(CURDIR)/debian/pxvirt-spdk/usr/share/bash-completion/completions/spdk

2
src

@ -1 +1 @@
Subproject commit 19524ad45373e35d5fdc06f4e081444d87ceed80
Subproject commit 2ae2fb47126564aebe9fed61743c7af7e170fcac