diff --git a/debian/changelog b/debian/changelog index cb8795c..1cf2353 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pxvirt-spdk (25.05) bookworm; urgency=medium + + * update spdk to 25.05 + + -- Jiangcuo Thu, 26 Jun 2025 13:56:49 +0800 + pxvirt-spdk (24.09) bookworm; urgency=medium * init diff --git a/debian/patches/003-build-for-generic.patch b/debian/patches/003-build-for-generic.patch deleted file mode 100644 index 7bc679a..0000000 --- a/debian/patches/003-build-for-generic.patch +++ /dev/null @@ -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' diff --git a/debian/patches/series b/debian/patches/series index 970cdd0..e58e0b9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 001-fix-autoclean-on-first-build.patch 002-fix-spdk_setup-rootdir-path.patch -003-build-for-generic.patch diff --git a/debian/rules b/debian/rules index f82bacf..d2dd436 100755 --- a/debian/rules +++ b/debian/rules @@ -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 diff --git a/src b/src index 19524ad..2ae2fb4 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit 19524ad45373e35d5fdc06f4e081444d87ceed80 +Subproject commit 2ae2fb47126564aebe9fed61743c7af7e170fcac