Accepting request 481702 from network

1

OBS-URL: https://build.opensuse.org/request/show/481702
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpdk?expand=0&rev=12

dpdk-thunderx.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 20 15:32:12 CET 2017 - ndas@suse.de
+
+- Disable dpdk-kmp package for ix86.
+
 -------------------------------------------------------------------
 Fri Mar  3 11:37:59 CET 2017 -  ndas@suse.de
 

dpdk-thunderx.spec

@@ -123,6 +123,7 @@ Example applications utilizing the Data Plane Development Kit, such
 as L2 and L3 forwarding.
 %endif
 
+%ifnarch %{ix86}
 %package kmp
 Summary:        DPDK KNI kernel module (thunderx)
 Group:          System/Kernel
@@ -132,6 +133,7 @@ Conflicts:      otherproviders(dpdk-any-kmp)
 
 %description kmp
 The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the Linux* control plane.
+%endif
 
 %define sdkdir  %{_datadir}/dpdk
 %define docdir  %{_docdir}/dpdk
@@ -181,6 +183,11 @@ setconf CONFIG_RTE_LIBRTE_PMD_PCAP y
 setconf CONFIG_RTE_LIBRTE_VHOST_NUMA y
 
 setconf CONFIG_RTE_EAL_IGB_UIO n
+%ifnarch %{ix86}
+setconf CONFIG_RTE_KNI_KMOD y
+%else
+setconf CONFIG_RTE_KNI_KMOD n
+%endif
 
 %if %{with shared}
 setconf CONFIG_RTE_BUILD_SHARED_LIB y
@@ -192,6 +199,8 @@ setconf CONFIG_RTE_LIBRTE_DISTRIBUTOR n
 %ifarch ppc64le
 setconf CONFIG_RTE_LIBRTE_PMD_RING n
 %endif
+
+%ifnarch %{ix86}
 export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
 for flavor in %{flavors_to_build}; do
 	cp -r %{target} %{target}-$flavor
@@ -199,6 +208,7 @@ for flavor in %{flavors_to_build}; do
 	make CC=gcc-6 KERNELDIR=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor %{?_smp_mflags}
 	cd -
 done
+%endif
 
 make CC=gcc-6 V=1 O=%{target} %{?_smp_mflags}
 make CC=gcc-6 V=1 O=%{target} %{?_smp_mflags} doc-api-html
@@ -208,6 +218,7 @@ make CC=gcc-6 V=1 O=%{target}/examples T=%{target} %{?_smp_mflags} examples
 %endif
 
 %install
+%ifnarch %{ix86}
 # export needed for kmp package
 export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
 export INSTALL_MOD_PATH=%{buildroot}
@@ -219,7 +230,7 @@ for flavor in %{flavors_to_build}; do
 	%make_install  KERNELDIR=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor prefix=%{_usr} libdir=%{_libdir}
 	cd -
 done
-
+%endif
 # In case dpdk-devel is installed
 unset RTE_SDK RTE_INCLUDE RTE_TARGET
 

dpdk.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 20 15:32:12 CET 2017 - ndas@suse.de
+
+- Disable dpdk-kmp package for ix86.
+
 -------------------------------------------------------------------
 Fri Mar  3 11:37:59 CET 2017 -  ndas@suse.de
 

dpdk.spec

@@ -121,6 +121,7 @@ Example applications utilizing the Data Plane Development Kit, such
 as L2 and L3 forwarding.
 %endif
 
+%ifnarch %{ix86}
 %package kmp
 Summary:        DPDK KNI kernel module
 Group:          System/Kernel
@@ -130,6 +131,7 @@ Conflicts:      otherproviders(dpdk-any-kmp)
 
 %description kmp
 The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the Linux* control plane.
+%endif
 
 %define sdkdir  %{_datadir}/dpdk
 %define docdir  %{_docdir}/dpdk
@@ -179,6 +181,11 @@ setconf CONFIG_RTE_LIBRTE_PMD_PCAP y
 setconf CONFIG_RTE_LIBRTE_VHOST_NUMA y
 
 setconf CONFIG_RTE_EAL_IGB_UIO n
+%ifnarch %{ix86}
+setconf CONFIG_RTE_KNI_KMOD y
+%else
+setconf CONFIG_RTE_KNI_KMOD n
+%endif
 
 %if %{with shared}
 setconf CONFIG_RTE_BUILD_SHARED_LIB y
@@ -190,6 +197,8 @@ setconf CONFIG_RTE_LIBRTE_DISTRIBUTOR n
 %ifarch ppc64le
 setconf CONFIG_RTE_LIBRTE_PMD_RING n
 %endif
+
+%ifnarch %{ix86}
 export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
 for flavor in %{flavors_to_build}; do
 	cp -r %{target} %{target}-$flavor
@@ -197,6 +206,7 @@ for flavor in %{flavors_to_build}; do
 	make CC=gcc-6 KERNELDIR=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor %{?_smp_mflags}
 	cd -
 done
+%endif
 
 make CC=gcc-6 V=1 O=%{target} %{?_smp_mflags}
 make CC=gcc-6 V=1 O=%{target} %{?_smp_mflags} doc-api-html
@@ -206,6 +216,7 @@ make CC=gcc-6 V=1 O=%{target}/examples T=%{target} %{?_smp_mflags} examples
 %endif
 
 %install
+%ifnarch %{ix86}
 # export needed for kmp package
 export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
 export INSTALL_MOD_PATH=%{buildroot}
@@ -217,7 +228,7 @@ for flavor in %{flavors_to_build}; do
 	%make_install  KERNELDIR=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor prefix=%{_usr} libdir=%{_libdir}
 	cd -
 done
-
+%endif
 # In case dpdk-devel is installed
 unset RTE_SDK RTE_INCLUDE RTE_TARGET