diff --git a/CHANGELOG.md b/CHANGELOG.md index a676c0b72..bb5b97a35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -137,6 +137,11 @@ provided in `scripts/rpc.py` for consistency. An new optional parameter `config_kernel_mode` was added to the RPC `idxd_scan_accel_engine`, and this is used to enable using the kernel mode IDXD driver. +### rpm + +Removed deprecated `pkg/spdk.spec`, please use `rpmbuild/spdk.spec` instead. +See [RPM documentation](https://spdk.io/doc/rpm.html) for more details. + ### thread Red-black tree has been used for timed pollers to provide faster insertion and deletion diff --git a/deprecation.md b/deprecation.md index 1bd345a7b..b92db8b97 100644 --- a/deprecation.md +++ b/deprecation.md @@ -30,9 +30,3 @@ Parameter `enable-zerocopy-send` of RPC `sock_impl_set_options` is deprecated an use `enable-zerocopy-send-server` or `enable-zerocopy-send-client` instead. Parameter `disable-zerocopy-send` of RPC `sock_impl_set_options` is deprecated and will be removed in SPDK 21.07, use `disable-zerocopy-send-server` or `disable-zerocopy-send-client` instead. - -## rpm - -`pkg/spdk.spec` is considered to be deprecated and scheduled for removal in SPDK 21.07. -Please use `rpmbuild/spdk.spec` instead and see -[RPM documentation](https://spdk.io/doc/rpm.html) for more details. diff --git a/pkg/README b/pkg/README deleted file mode 100644 index 58ee61534..000000000 --- a/pkg/README +++ /dev/null @@ -1,3 +0,0 @@ -pkg/spdk.spec is deprecated and not fully supported. Use of the -rpmbuild/spdk.spec together with provided script suite is advised. -The pkg/spdk.spec is going to be removed from future releases. diff --git a/pkg/spdk.spec b/pkg/spdk.spec deleted file mode 100644 index c6861081d..000000000 --- a/pkg/spdk.spec +++ /dev/null @@ -1,158 +0,0 @@ -# Build documentation package -%bcond_with doc - -Name: spdk -Version: master -Release: 0%{?dist} -Epoch: 0 -URL: http://spdk.io - -Source: https://github.com/spdk/spdk/archive/master.tar.gz -Summary: Set of libraries and utilities for high performance user-mode storage - -%define package_version %{epoch}:%{version}-%{release} - -%define install_datadir %{buildroot}/%{_datadir}/%{name} -%define install_sbindir %{buildroot}/%{_sbindir} -%define install_docdir %{buildroot}/%{_docdir}/%{name} - -License: BSD - -# Only x86_64 is supported -ExclusiveArch: x86_64 - -BuildRequires: gcc gcc-c++ make -BuildRequires: dpdk-devel, numactl-devel, ncurses-devel -BuildRequires: libiscsi-devel, libaio-devel, openssl-devel, libuuid-devel -BuildRequires: libibverbs-devel, librdmacm-devel -%if %{with doc} -BuildRequires: doxygen mscgen graphviz -%endif - -# Install dependencies -Requires: dpdk >= 19.11, numactl-libs, openssl-libs -Requires: libiscsi, libaio, libuuid -Requires: python3-configshell, python3-pexpect -# NVMe over Fabrics -Requires: librdmacm, librdmacm -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -%description -The Storage Performance Development Kit provides a set of tools -and libraries for writing high performance, scalable, user-mode storage -applications. - - -%package devel -Summary: Storage Performance Development Kit development files -Requires: %{name}%{?_isa} = %{package_version} -Provides: %{name}-static%{?_isa} = %{package_version} - -%description devel -This package contains the headers and other files needed for -developing applications with the Storage Performance Development Kit. - - -%package tools -Summary: Storage Performance Development Kit tools files -Requires: %{name}%{?_isa} = %{package_version} python3 python3-configshell python3-pexpect -BuildArch: noarch - -%description tools -%{summary} - - -%if %{with doc} -%package doc -Summary: Storage Performance Development Kit documentation -BuildArch: noarch - -%description doc -%{summary} -%endif - - -%prep -cat <<-WARNING - WARNING: This RPM spec is considered to be deprecated and scheduled for removal. - Using rpmbuild/spdk.spec and accompanying tooling is advised. -WARNING -# add -q -%autosetup -n spdk-%{version} - - -%build -./configure --prefix=%{_usr} \ - --disable-tests \ - --disable-unit-tests \ - --without-crypto \ - --with-dpdk=/usr/share/dpdk/x86_64-default-linuxapp-gcc \ - --without-fio \ - --with-vhost \ - --without-pmdk \ - --without-rbd \ - --with-rdma \ - --with-shared \ - --with-iscsi-initiator \ - --without-vtune - -make -j`nproc` all - -%if %{with doc} -make -C doc -%endif - -%install -%make_install -j`nproc` prefix=%{_usr} libdir=%{_libdir} datadir=%{_datadir} - -# Install tools -mkdir -p %{install_datadir} -find scripts -type f -regextype egrep -regex '.*(spdkcli|rpc).*[.]py' \ - -exec cp --parents -t %{install_datadir} {} ";" - -# env is banned - replace '/usr/bin/env anything' with '/usr/bin/anything' -find %{install_datadir}/scripts -type f -regextype egrep -regex '.*([.]py|[.]sh)' \ - -exec sed -i -E '1s@#!/usr/bin/env (.*)@#!/usr/bin/\1@' {} + - -# symlinks to tools -mkdir -p %{install_sbindir} -ln -sf -r %{install_datadir}/scripts/rpc.py %{install_sbindir}/%{name}-rpc -ln -sf -r %{install_datadir}/scripts/spdkcli.py %{install_sbindir}/%{name}-cli - -%if %{with doc} -# Install doc -mkdir -p %{install_docdir} -mv doc/output/html/ %{install_docdir} -%endif - - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - - -%files -%{_bindir}/spdk_* -%{_libdir}/*.so.* - - -%files devel -%{_includedir}/%{name} -%{_libdir}/*.a -%{_libdir}/*.so - - -%files tools -%{_datadir}/%{name}/scripts -%{_sbindir}/%{name}-rpc -%{_sbindir}/%{name}-cli - -%if %{with doc} -%files doc -%{_docdir}/%{name} -%endif - - -%changelog -* Tue Sep 18 2018 Pawel Wodkowski - 0:18.07-3 -- Initial RPM release