[dpdk-dev] [PATCH 0/5] packaging release 2.0.0

[dpdk-dev] [PATCH 0/5] packaging release 2.0.0

[Thomas Monjalon]

These are the last patches needed for packaging the release of dpdk-2.0.0.
It was tested to generate a RPM on Fedora 20 without fuse.
The package includes PDF doc and enable features for vhost, pcap and Xen.

If nobody see something wrong in these patches, they will be applied
tomorrow, April 3rd in order to close the release.

Thomas Monjalon (5):
  mk: remove fuse requirement for vhost-user
  mk: reduce PDF build commands
  pkg: remove -core file suffix
  pkg: update RPM
  version: 2.0.0

 doc/guides/rel_notes/index.rst              |  2 +-
 doc/guides/rel_notes/rel_description.rst    |  2 +-
 lib/librte_eal/common/include/rte_version.h |  4 +-
 mk/rte.app.mk                               |  2 +-
 mk/rte.sdkdoc.mk                            |  2 +-
 pkg/{dpdk-core.spec => dpdk.spec}           | 59 ++++++++++++++++-------------
 6 files changed, 38 insertions(+), 33 deletions(-)
 rename pkg/{dpdk-core.spec => dpdk.spec} (66%)

-- 
2.2.2

[dpdk-dev] [PATCH 1/5] mk: remove fuse requirement for vhost-user

[Thomas Monjalon]

The fuse library is needed for vhost-cuse as required in commit 28a1ccca41bf.
The case vhost-user was forgotten for application linking.

Fixes: 28a1ccca41bf ("vhost: add build option for vhost-user")

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 mk/rte.app.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 63a41e2..56886dc 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -143,7 +143,7 @@ ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y)
 LDLIBS += -lpcap
 endif
 
-ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y)
+ifeq ($(CONFIG_RTE_LIBRTE_VHOST)$(CONFIG_RTE_LIBRTE_VHOST_USER),yn)
 LDLIBS += -lfuse
 endif
 
-- 
2.2.2

[dpdk-dev] [PATCH 2/5] mk: reduce PDF build commands

[Thomas Monjalon]

In case of documents without image, an empty rm command can be seen if V=1.
Remove it to avoid disturbing debugging.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 mk/rte.sdkdoc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk
index f91e079..9952f25 100644
--- a/mk/rte.sdkdoc.mk
+++ b/mk/rte.sdkdoc.mk
@@ -99,7 +99,7 @@ guides-pdf-%:
 	$(Q)$(RTE_SPHINX_BUILD) -b latex $(RTE_SPHINX_VERBOSE) \
 		-c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides/$* \
 		$(RTE_OUTPUT)/doc/pdf/guides/$*
-	$(Q)rm -f $^
+	$(if $^,$(Q)rm -f $^)
 	@echo 'pdflatex processing $@...'
 	$(Q)$(MAKE) all-pdf -sC $(RTE_OUTPUT)/doc/pdf/guides/$* \
 		LATEXOPTS=$(RTE_PDFLATEX_VERBOSE)
-- 
2.2.2

[dpdk-dev] [PATCH 3/5] pkg: remove -core file suffix

[Thomas Monjalon]

Since -core suffix was removed from the package names in commit
6f2760ecdf4e, the file name should also be updated.

The alignment of build commands is also changed to prepare next patch.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 pkg/{dpdk-core.spec => dpdk.spec} | 48 +++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)
 rename pkg/{dpdk-core.spec => dpdk.spec} (71%)

diff --git a/pkg/dpdk-core.spec b/pkg/dpdk.spec
similarity index 71%
rename from pkg/dpdk-core.spec
rename to pkg/dpdk.spec
index 76ae701..9a92e95 100644
--- a/pkg/dpdk-core.spec
+++ b/pkg/dpdk.spec
@@ -88,30 +88,30 @@ make O=%{target} doc
 
 %install
 rm -rf %{buildroot}
-make           O=%{target}     DESTDIR=%{destdir}
-mkdir -p                               %{buildroot}%{moddir}
-mv    %{destdir}/%{target}/kmod/*.ko   %{buildroot}%{moddir}
-rmdir %{destdir}/%{target}/kmod
-mkdir -p                               %{buildroot}%{_sbindir}
-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
-mv    %{destdir}/%{target}/include     %{buildroot}%{_includedir}
-mv    %{destdir}/%{target}/lib         %{buildroot}%{_libdir}
-mkdir -p                               %{buildroot}%{docdir}
-mv    %{destdir}/%{target}/doc/*       %{buildroot}%{docdir}
-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}
-ln -s            %{datadir}/config     %{buildroot}%{datadir}/%{target}/.config
-ln -s            %{_includedir}        %{buildroot}%{datadir}/%{target}/include
-ln -s            %{_libdir}            %{buildroot}%{datadir}/%{target}/lib
+make            O=%{target}      DESTDIR=%{destdir}
+mkdir -p                                 %{buildroot}%{moddir}
+mv     %{destdir}/%{target}/kmod/*.ko    %{buildroot}%{moddir}
+rmdir  %{destdir}/%{target}/kmod
+mkdir -p                                 %{buildroot}%{_sbindir}
+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
+mv     %{destdir}/%{target}/include      %{buildroot}%{_includedir}
+mv     %{destdir}/%{target}/lib          %{buildroot}%{_libdir}
+mkdir -p                                 %{buildroot}%{docdir}
+mv     %{destdir}/%{target}/doc/*        %{buildroot}%{docdir}
+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}
+ln -s             %{datadir}/config      %{buildroot}%{datadir}/%{target}/.config
+ln -s             %{_includedir}         %{buildroot}%{datadir}/%{target}/include
+ln -s             %{_libdir}             %{buildroot}%{datadir}/%{target}/lib
 
 %files
 %dir %{datadir}
-- 
2.2.2

[dpdk-dev] [PATCH 4/5] pkg: update RPM

[Thomas Monjalon]

Enable vhost-user and build PDF doc.
Inkscape and TeXLive are required to convert .svg and .rst to .pdf.
Temporary sphinx files .* (.doctrees/ and .buildinfo) are cleaned.

Tested on Fedora 20.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 pkg/dpdk.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkg/dpdk.spec b/pkg/dpdk.spec
index 9a92e95..56fccd0 100644
--- a/pkg/dpdk.spec
+++ b/pkg/dpdk.spec
@@ -44,7 +44,9 @@ ExclusiveArch: i686, x86_64
 %global target %{_arch}-native-linuxapp-gcc
 %global machine default
 
-BuildRequires: kernel-devel, kernel-headers, libpcap-devel, xen-devel, doxygen, python-sphinx
+BuildRequires: kernel-devel, kernel-headers, libpcap-devel, xen-devel
+BuildRequires: doxygen, python-sphinx, inkscape
+BuildRequires: texlive-collection-latexextra, texlive-collection-fontsextra
 
 %description
 DPDK core includes kernel modules, core libraries and tools.
@@ -65,7 +67,7 @@ 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.
+and guides in sphinx HTML/PDF formats.
 
 %global destdir %{buildroot}%{_prefix}
 %global moddir  /lib/modules/%(uname -r)/extra
@@ -80,6 +82,7 @@ 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_VHOST=).*,\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
@@ -100,8 +103,10 @@ rmdir  %{destdir}/%{target}/app
 mv     %{destdir}/%{target}/include      %{buildroot}%{_includedir}
 mv     %{destdir}/%{target}/lib          %{buildroot}%{_libdir}
 mkdir -p                                 %{buildroot}%{docdir}
-mv     %{destdir}/%{target}/doc/*        %{buildroot}%{docdir}
-rmdir  %{destdir}/%{target}/doc
+rm -rf %{destdir}/%{target}/doc/*/*/.{build,doc}*
+mv     %{destdir}/%{target}/doc/html/*   %{buildroot}%{docdir}
+mv     %{destdir}/%{target}/doc/*/*/*pdf %{buildroot}%{docdir}/guides
+rm -rf %{destdir}/%{target}/doc
 mkdir -p                                 %{buildroot}%{datadir}
 mv     %{destdir}/%{target}/.config      %{buildroot}%{datadir}/config
 mv     %{destdir}/%{target}              %{buildroot}%{datadir}
-- 
2.2.2

[dpdk-dev] [PATCH 5/5] version: 2.0.0

[Thomas Monjalon]

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 doc/guides/rel_notes/index.rst              | 2 +-
 doc/guides/rel_notes/rel_description.rst    | 2 +-
 lib/librte_eal/common/include/rte_version.h | 4 ++--
 pkg/dpdk.spec                               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/guides/rel_notes/index.rst b/doc/guides/rel_notes/index.rst
index cf712b2..d790783 100644
--- a/doc/guides/rel_notes/index.rst
+++ b/doc/guides/rel_notes/index.rst
@@ -31,7 +31,7 @@
 Release Notes
 =============
 
-Package Version: 1.8
+Package Version: 2.0
 
 |today|
 
diff --git a/doc/guides/rel_notes/rel_description.rst b/doc/guides/rel_notes/rel_description.rst
index c8ff483..9b1fb7f 100644
--- a/doc/guides/rel_notes/rel_description.rst
+++ b/doc/guides/rel_notes/rel_description.rst
@@ -32,7 +32,7 @@ Description of Release
 ======================
 
 These release notes cover the new features,
-fixed bugs and known issues for Data Plane Development Kit (DPDK) release version 1.7.0.
+fixed bugs and known issues for Data Plane Development Kit (DPDK) release version 2.0.0.
 
 For instructions on compiling and running the release, see the *DPDK Getting Started Guide*.
 
diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h
index 5a50809..459b648 100644
--- a/lib/librte_eal/common/include/rte_version.h
+++ b/lib/librte_eal/common/include/rte_version.h
@@ -70,14 +70,14 @@ extern "C" {
 /**
  * Extra string to be appended to version number
  */
-#define RTE_VER_SUFFIX "-rc"
+#define RTE_VER_SUFFIX ""
 
 /**
  * Patch release number
  *   0-15 = release candidates
  *   16   = release
  */
-#define RTE_VER_PATCH_RELEASE 3
+#define RTE_VER_PATCH_RELEASE 16
 
 /**
  * Macro to compute a version number usable for comparisons
diff --git a/pkg/dpdk.spec b/pkg/dpdk.spec
index 56fccd0..5f6ec6a 100644
--- a/pkg/dpdk.spec
+++ b/pkg/dpdk.spec
@@ -30,7 +30,7 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Name: dpdk
-Version: 1.8.0
+Version: 2.0.0
 Release: 1
 Packager: packaging@6wind.com
 URL: http://dpdk.org
-- 
2.2.2

Re: [dpdk-dev] [PATCH 2/5] mk: reduce PDF build commands

[Butler, Siobhan A]

> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Thomas Monjalon
> Sent: Thursday, April 2, 2015 8:58 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH 2/5] mk: reduce PDF build commands
> 
> In case of documents without image, an empty rm command can be seen if
> V=1.
> Remove it to avoid disturbing debugging.
> 
> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
> ---
>  mk/rte.sdkdoc.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk index f91e079..9952f25
> 100644
> --- a/mk/rte.sdkdoc.mk
> +++ b/mk/rte.sdkdoc.mk
> @@ -99,7 +99,7 @@ guides-pdf-%:
>  	$(Q)$(RTE_SPHINX_BUILD) -b latex $(RTE_SPHINX_VERBOSE) \
>  		-c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides/$* \
>  		$(RTE_OUTPUT)/doc/pdf/guides/$*
> -	$(Q)rm -f $^
> +	$(if $^,$(Q)rm -f $^)
>  	@echo 'pdflatex processing $@...'
>  	$(Q)$(MAKE) all-pdf -sC $(RTE_OUTPUT)/doc/pdf/guides/$* \
>  		LATEXOPTS=$(RTE_PDFLATEX_VERBOSE)
> --
> 2.2.2
Acked-by Siobhan Butler <siobhan.a.butler@intel.com>

Re: [dpdk-dev] [PATCH 0/5] packaging release 2.0.0

[Thomas Monjalon]

> These are the last patches needed for packaging the release of dpdk-2.0.0.
> It was tested to generate a RPM on Fedora 20 without fuse.
> The package includes PDF doc and enable features for vhost, pcap and Xen.
> 
> If nobody see something wrong in these patches, they will be applied
> tomorrow, April 3rd in order to close the release.
> 
> Thomas Monjalon (5):
>   mk: remove fuse requirement for vhost-user
>   mk: reduce PDF build commands
>   pkg: remove -core file suffix
>   pkg: update RPM
>   version: 2.0.0

Applied