X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=pkg%2Fdpdk-core.spec;h=76ae701133744e5aaabc696b8d06a9e981b9addd;hb=ec51901a0b6632556b3c2d10998d72eaf1a54141;hp=77d6c76bac694169b61225721fd5dfc23e2d6970;hpb=c9c96774aed47c31d7286fa7f2a03ae4a58197b9;p=dpdk.git

diff --git a/pkg/dpdk-core.spec b/pkg/dpdk-core.spec
index 77d6c76bac..76ae701133 100644
--- a/pkg/dpdk-core.spec
+++ b/pkg/dpdk-core.spec
@@ -29,52 +29,60 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# name includes full version because there is no ABI stability yet
-Name: dpdk-core-1.6.0
-Version: r1
-%define fullversion 1.6.0%{version}
+Name: dpdk
+Version: 1.8.0
 Release: 1
 Packager: packaging@6wind.com
 URL: http://dpdk.org
-Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{fullversion}.tar.gz
+Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{version}.tar.gz
 
-Summary: Intel(r) Data Plane Development Kit core
+Summary: Data Plane Development Kit core
 Group: System Environment/Libraries
 License: BSD and LGPLv2 and GPLv2
 
 ExclusiveArch: i686, x86_64
-%define target %{_arch}-default-linuxapp-gcc
-%define machine default
+%global target %{_arch}-native-linuxapp-gcc
+%global machine default
 
-BuildRequires: kernel-devel, kernel-headers, doxygen
+BuildRequires: kernel-devel, kernel-headers, libpcap-devel, xen-devel, doxygen, python-sphinx
 
 %description
-Intel(r) DPDK core includes kernel modules, core libraries and tools.
+DPDK core includes kernel modules, core libraries and tools.
 testpmd application allows to test fast packet processing environments
 on x86 platforms. For instance, it can be used to check that environment
 can support fast path applications such as 6WINDGate, pktgen, rumptcpip, etc.
 More libraries are available as extensions in other packages.
 
 %package devel
-Summary: Intel(r) Data Plane Development Kit core for development
+Summary: Data Plane Development Kit for development
+Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
-Intel(r) DPDK core-devel is a set of makefiles, headers, examples and documentation
+DPDK devel is a set of makefiles, headers and examples
 for fast packet processing on x86 platforms.
-More libraries are available as extensions in other packages.
 
-%define destdir %{buildroot}%{_prefix}
-%define moddir  /lib/modules/%(uname -r)/extra
-%define datadir %{_datadir}/dpdk
-%define docdir  %{_docdir}/dpdk
+%package doc
+Summary: Data Plane Development Kit API documentation
+BuildArch: noarch
+%description doc
+DPDK doc is divided in two parts: API details in doxygen HTML format
+and guides in sphinx HTML format.
+
+%global destdir %{buildroot}%{_prefix}
+%global moddir  /lib/modules/%(uname -r)/extra
+%global datadir %{_datadir}/dpdk
+%global docdir  %{_docdir}/dpdk
 
 %prep
-%setup -qn dpdk-%{fullversion}
+%setup -q
 
 %build
 make O=%{target} T=%{target} config
 sed -ri 's,(RTE_MACHINE=).*,\1%{machine},' %{target}/.config
 sed -ri 's,(RTE_APP_TEST=).*,\1n,'         %{target}/.config
 sed -ri 's,(RTE_BUILD_SHARED_LIB=).*,\1y,' %{target}/.config
+sed -ri 's,(LIBRTE_PMD_PCAP=).*,\1y,'      %{target}/.config
+sed -ri 's,(LIBRTE_PMD_XENVIRT=).*,\1y,'   %{target}/.config
+sed -ri 's,(LIBRTE_XEN_DOM0=).*,\1y,'      %{target}/.config
 make O=%{target} %{?_smp_mflags}
 make O=%{target} doc
 
@@ -85,7 +93,7 @@ mkdir -p                               %{buildroot}%{moddir}
 mv    %{destdir}/%{target}/kmod/*.ko   %{buildroot}%{moddir}
 rmdir %{destdir}/%{target}/kmod
 mkdir -p                               %{buildroot}%{_sbindir}
-ln -s %{datadir}/tools/igb_uio_bind.py %{buildroot}%{_sbindir}/igb_uio_bind
+ln -s %{datadir}/tools/*nic_bind.py    %{buildroot}%{_sbindir}/dpdk_nic_bind
 mkdir -p                               %{buildroot}%{_bindir}
 mv    %{destdir}/%{target}/app/testpmd %{buildroot}%{_bindir}
 rmdir %{destdir}/%{target}/app
@@ -97,6 +105,7 @@ rmdir %{destdir}/%{target}/doc
 mkdir -p                               %{buildroot}%{datadir}
 mv    %{destdir}/%{target}/.config     %{buildroot}%{datadir}/config
 mv    %{destdir}/%{target}             %{buildroot}%{datadir}
+mv    %{destdir}/scripts               %{buildroot}%{datadir}
 mv    %{destdir}/mk                    %{buildroot}%{datadir}
 cp -a            examples              %{buildroot}%{datadir}
 cp -a            tools                 %{buildroot}%{datadir}
@@ -116,8 +125,11 @@ ln -s            %{_libdir}            %{buildroot}%{datadir}/%{target}/lib
 %files devel
 %{_includedir}/*
 %{datadir}/mk
+%{datadir}/scripts
 %{datadir}/%{target}
 %{datadir}/examples
+
+%files doc
 %doc %{docdir}
 
 %post