From 59de1e717397e48bf165236fe8f2c080969fb192395005df5babd367465fb2e4 Mon Sep 17 00:00:00 2001 From: Nirmoy Das Date: Fri, 3 Feb 2017 15:13:14 +0000 Subject: [PATCH 1/4] Accepting request 454432 from home:ndas:branches:network - Update to version 16.11(fate#321541). Some of the new features are listed below: * Added software parser for packet type. * Improved offloads support in mbuf. * Added vhost-user dequeue zero copy support. * Added vhost-user indirect descriptors support. * Added vhost PMD xstats. * Added virtio NEON support for ARM. * Updated the ixgbe base driver. * Added APIs for VF management to the ixgbe PMD. * Updated the enic driver. * Added openssl PMD. * Added support for new gcc -march option. Detailed changes can be obtained from http://dpdk.org/doc/guides/rel_notes/release_16_11.html - Resolved fixes in the updated versions are : enic: Fixed several flow director issues. enic: Fixed inadvertent setting of L4 checksum ptype on ICMP packets. enic: Fixed high driver overhead when servicing Rx queues beyond the first. - Update to version 16.11(fate#321541). Some of the new features are listed below: * Added software parser for packet type. * Improved offloads support in mbuf. * Added vhost-user dequeue zero copy support. * Added vhost-user indirect descriptors support. * Added vhost PMD xstats. * Added virtio NEON support for ARM. * Updated the ixgbe base driver. * Added APIs for VF management to the ixgbe PMD. * Updated the enic driver. * Added openssl PMD. * Added support for new gcc -march option. OBS-URL: https://build.opensuse.org/request/show/454432 OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=28 --- dpdk-16.07.2.tar.xz | 3 --- dpdk-16.11.tar.xz | 3 +++ dpdk-thunderx.changes | 21 +++++++++++++++++++++ dpdk-thunderx.spec | 4 ++-- dpdk.changes | 21 +++++++++++++++++++++ dpdk.spec | 4 ++-- 6 files changed, 49 insertions(+), 7 deletions(-) delete mode 100644 dpdk-16.07.2.tar.xz create mode 100644 dpdk-16.11.tar.xz diff --git a/dpdk-16.07.2.tar.xz b/dpdk-16.07.2.tar.xz deleted file mode 100644 index 1ac3255..0000000 --- a/dpdk-16.07.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6a01417bcd1adf41f2a0d6c73ee95fbe251a0f100550523df15e1fbeb57fcd7 -size 11351988 diff --git a/dpdk-16.11.tar.xz b/dpdk-16.11.tar.xz new file mode 100644 index 0000000..f7d8422 --- /dev/null +++ b/dpdk-16.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2923017f0da808c09c2722e02fecb071b95f0ff0164d11ea26f170c7048517a +size 9048728 diff --git a/dpdk-thunderx.changes b/dpdk-thunderx.changes index 2a9d12b..19ad6e0 100644 --- a/dpdk-thunderx.changes +++ b/dpdk-thunderx.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Feb 2 15:21:14 CET 2017 - ndas@suse.de + +- Update to version 16.11(fate#321541). Some of the new features are listed below: + * Added software parser for packet type. + * Improved offloads support in mbuf. + * Added vhost-user dequeue zero copy support. + * Added vhost-user indirect descriptors support. + * Added vhost PMD xstats. + * Added virtio NEON support for ARM. + * Updated the ixgbe base driver. + * Added APIs for VF management to the ixgbe PMD. + * Updated the enic driver. + * Added openssl PMD. + * Added support for new gcc -march option. + Detailed changes can be obtained from http://dpdk.org/doc/guides/rel_notes/release_16_11.html +- Resolved fixes in the updated versions are : + enic: Fixed several flow director issues. + enic: Fixed inadvertent setting of L4 checksum ptype on ICMP packets. + enic: Fixed high driver overhead when servicing Rx queues beyond the first. + ------------------------------------------------------------------- Fri Jan 20 11:01:47 CET 2017 - ndas@suse.de diff --git a/dpdk-thunderx.spec b/dpdk-thunderx.spec index 5ae7e2f..0fe1a64 100644 --- a/dpdk-thunderx.spec +++ b/dpdk-thunderx.spec @@ -43,7 +43,7 @@ # Do NOT edit this auto generated file! Edit dpdk.spec instead # and run 'pre_checkin.sh' before committing Name: dpdk-thunderx -Version: 16.07.2 +Version: 16.11 Release: 0 Summary: Set of libraries and drivers for fast packet processing (thunderx) License: BSD-3-Clause and GPL-2.0 and LGPL-2.1 @@ -127,7 +127,7 @@ as L2 and L3 forwarding. %define pmddir %{_libdir}/dpdk-pmds %prep -%setup -q -n dpdk-stable-%{version} +%setup -q -n dpdk-%{version} %patch1 -p1 -z .enic # This fixes CROSS compilation (broken) in the mk file for ThunderX sed -i '/^CROSS /s/^/#/' mk/machine/thunderx/rte.vars.mk diff --git a/dpdk.changes b/dpdk.changes index 2a9d12b..19ad6e0 100644 --- a/dpdk.changes +++ b/dpdk.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Feb 2 15:21:14 CET 2017 - ndas@suse.de + +- Update to version 16.11(fate#321541). Some of the new features are listed below: + * Added software parser for packet type. + * Improved offloads support in mbuf. + * Added vhost-user dequeue zero copy support. + * Added vhost-user indirect descriptors support. + * Added vhost PMD xstats. + * Added virtio NEON support for ARM. + * Updated the ixgbe base driver. + * Added APIs for VF management to the ixgbe PMD. + * Updated the enic driver. + * Added openssl PMD. + * Added support for new gcc -march option. + Detailed changes can be obtained from http://dpdk.org/doc/guides/rel_notes/release_16_11.html +- Resolved fixes in the updated versions are : + enic: Fixed several flow director issues. + enic: Fixed inadvertent setting of L4 checksum ptype on ICMP packets. + enic: Fixed high driver overhead when servicing Rx queues beyond the first. + ------------------------------------------------------------------- Fri Jan 20 11:01:47 CET 2017 - ndas@suse.de diff --git a/dpdk.spec b/dpdk.spec index 727931b..3d46d6f 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -41,7 +41,7 @@ # Add option to build without tools %bcond_without tools Name: dpdk -Version: 16.07.2 +Version: 16.11 Release: 0 Summary: Set of libraries and drivers for fast packet processing License: BSD-3-Clause and GPL-2.0 and LGPL-2.1 @@ -125,7 +125,7 @@ as L2 and L3 forwarding. %define pmddir %{_libdir}/dpdk-pmds %prep -%setup -q -n dpdk-stable-%{version} +%setup -q -n dpdk-%{version} %patch1 -p1 -z .enic # This fixes CROSS compilation (broken) in the mk file for ThunderX sed -i '/^CROSS /s/^/#/' mk/machine/thunderx/rte.vars.mk From 4f521025190df87780d553158e92f99eb265bb518b5c71dadfe579deace98879 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 9 Feb 2017 13:08:17 +0000 Subject: [PATCH 2/4] Accepting request 455753 from home:ndas:branches:network * Added software parser for packet type. * Improved offloads support in mbuf. * Added vhost-user dequeue zero copy support. * Added vhost-user indirect descriptors support. * Added vhost PMD xstats. * Added virtio NEON support for ARM. * Updated the ixgbe base driver. * Added APIs for VF management to the ixgbe PMD. * Updated the enic driver. * Added openssl PMD. * Added support for new gcc -march option. Detailed changes can be obtained from http://dpdk.org/doc/guides/rel_notes/release_16_11.html * enic: Fixed several flow director issues. * enic: Fixed inadvertent setting of L4 checksum ptype on ICMP packets. * enic: Fixed high driver overhead when servicing Rx queues beyond the first. * Added software parser for packet type. * Improved offloads support in mbuf. * Added vhost-user dequeue zero copy support. * Added vhost-user indirect descriptors support. * Added vhost PMD xstats. * Added virtio NEON support for ARM. * Updated the ixgbe base driver. * Added APIs for VF management to the ixgbe PMD. * Updated the enic driver. * Added openssl PMD. * Added support for new gcc -march option. Detailed changes can be obtained from http://dpdk.org/doc/guides/rel_notes/release_16_11.html * enic: Fixed several flow director issues. * enic: Fixed inadvertent setting of L4 checksum ptype on ICMP packets. * enic: Fixed high driver overhead when servicing Rx queues beyond the first. OBS-URL: https://build.opensuse.org/request/show/455753 OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=29 --- dpdk-thunderx.changes | 30 +++++++++++++++--------------- dpdk.changes | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dpdk-thunderx.changes b/dpdk-thunderx.changes index 19ad6e0..384312e 100644 --- a/dpdk-thunderx.changes +++ b/dpdk-thunderx.changes @@ -2,22 +2,22 @@ Thu Feb 2 15:21:14 CET 2017 - ndas@suse.de - Update to version 16.11(fate#321541). Some of the new features are listed below: - * Added software parser for packet type. - * Improved offloads support in mbuf. - * Added vhost-user dequeue zero copy support. - * Added vhost-user indirect descriptors support. - * Added vhost PMD xstats. - * Added virtio NEON support for ARM. - * Updated the ixgbe base driver. - * Added APIs for VF management to the ixgbe PMD. - * Updated the enic driver. - * Added openssl PMD. - * Added support for new gcc -march option. - Detailed changes can be obtained from http://dpdk.org/doc/guides/rel_notes/release_16_11.html + * Added software parser for packet type. + * Improved offloads support in mbuf. + * Added vhost-user dequeue zero copy support. + * Added vhost-user indirect descriptors support. + * Added vhost PMD xstats. + * Added virtio NEON support for ARM. + * Updated the ixgbe base driver. + * Added APIs for VF management to the ixgbe PMD. + * Updated the enic driver. + * Added openssl PMD. + * Added support for new gcc -march option. + Detailed changes can be obtained from http://dpdk.org/doc/guides/rel_notes/release_16_11.html - Resolved fixes in the updated versions are : - enic: Fixed several flow director issues. - enic: Fixed inadvertent setting of L4 checksum ptype on ICMP packets. - enic: Fixed high driver overhead when servicing Rx queues beyond the first. + * enic: Fixed several flow director issues. + * enic: Fixed inadvertent setting of L4 checksum ptype on ICMP packets. + * enic: Fixed high driver overhead when servicing Rx queues beyond the first. ------------------------------------------------------------------- Fri Jan 20 11:01:47 CET 2017 - ndas@suse.de diff --git a/dpdk.changes b/dpdk.changes index 19ad6e0..384312e 100644 --- a/dpdk.changes +++ b/dpdk.changes @@ -2,22 +2,22 @@ Thu Feb 2 15:21:14 CET 2017 - ndas@suse.de - Update to version 16.11(fate#321541). Some of the new features are listed below: - * Added software parser for packet type. - * Improved offloads support in mbuf. - * Added vhost-user dequeue zero copy support. - * Added vhost-user indirect descriptors support. - * Added vhost PMD xstats. - * Added virtio NEON support for ARM. - * Updated the ixgbe base driver. - * Added APIs for VF management to the ixgbe PMD. - * Updated the enic driver. - * Added openssl PMD. - * Added support for new gcc -march option. - Detailed changes can be obtained from http://dpdk.org/doc/guides/rel_notes/release_16_11.html + * Added software parser for packet type. + * Improved offloads support in mbuf. + * Added vhost-user dequeue zero copy support. + * Added vhost-user indirect descriptors support. + * Added vhost PMD xstats. + * Added virtio NEON support for ARM. + * Updated the ixgbe base driver. + * Added APIs for VF management to the ixgbe PMD. + * Updated the enic driver. + * Added openssl PMD. + * Added support for new gcc -march option. + Detailed changes can be obtained from http://dpdk.org/doc/guides/rel_notes/release_16_11.html - Resolved fixes in the updated versions are : - enic: Fixed several flow director issues. - enic: Fixed inadvertent setting of L4 checksum ptype on ICMP packets. - enic: Fixed high driver overhead when servicing Rx queues beyond the first. + * enic: Fixed several flow director issues. + * enic: Fixed inadvertent setting of L4 checksum ptype on ICMP packets. + * enic: Fixed high driver overhead when servicing Rx queues beyond the first. ------------------------------------------------------------------- Fri Jan 20 11:01:47 CET 2017 - ndas@suse.de From 8086eb4bdc3f6bfb3b2138e0bda52eb73cb9ee922bbc4e343e1d1c3b29f1bfdc Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 13 Feb 2017 11:42:18 +0000 Subject: [PATCH 3/4] Accepting request 456738 from home:ndas:branches:network - Enable rte_kni kernel module for dpdk(fate#322394). [+preamble] - Enable rte_kni kernel module for dpdk(fate#322394). [+preamble] OBS-URL: https://build.opensuse.org/request/show/456738 OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=30 --- dpdk-thunderx.changes | 6 ++++++ dpdk-thunderx.spec | 41 ++++++++++++++++++++++++++++++++++------- dpdk.changes | 6 ++++++ dpdk.spec | 41 ++++++++++++++++++++++++++++++++++------- preamble | 3 +++ 5 files changed, 83 insertions(+), 14 deletions(-) create mode 100644 preamble diff --git a/dpdk-thunderx.changes b/dpdk-thunderx.changes index 384312e..d8edad8 100644 --- a/dpdk-thunderx.changes +++ b/dpdk-thunderx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 10 11:24:27 CET 2017 - ndas@suse.de + +- Enable rte_kni kernel module for dpdk(fate#322394). + [+preamble] + ------------------------------------------------------------------- Thu Feb 2 15:21:14 CET 2017 - ndas@suse.de diff --git a/dpdk-thunderx.spec b/dpdk-thunderx.spec index 0fe1a64..b3293b0 100644 --- a/dpdk-thunderx.spec +++ b/dpdk-thunderx.spec @@ -22,7 +22,7 @@ %define machine native %define target x86_64-%{machine}-linuxapp-gcc %endif -%ifarch %ix86 +%ifarch %{ix86} %define machine native %define target i686-%{machine}-linuxapp-gcc %endif @@ -34,7 +34,6 @@ %define machine2 power8 %define target ppc_64-%{machine2}-linuxapp-gcc %endif - %bcond_without shared # Add option to build without examples %bcond_without examples @@ -50,6 +49,7 @@ License: BSD-3-Clause and GPL-2.0 and LGPL-2.1 Group: System/Libraries Url: http://dpdk.org Source: http://fast.dpdk.org/rel/dpdk-%{version}.tar.xz +Source1: preamble # PATCH-FIX-OPENSUSE 0001-enic-fix-Type-punning-and-strict-aliasing-warning.patch # This patch was originally taken from the fedora package but they have # removed it since then because of @@ -62,6 +62,7 @@ BuildRequires: fdupes BuildRequires: gcc6 BuildRequires: libnuma-devel BuildRequires: libpcap-devel +BuildRequires: pesign-obs-integration BuildRequires: zlib-devel ExclusiveArch: aarch64 x86_64 %ix86 ppc64le Provides: dpdk-any = %{version} @@ -121,6 +122,15 @@ Example applications utilizing the Data Plane Development Kit, such as L2 and L3 forwarding. %endif +%package kmp +Summary: DPDK KNI kernel module (thunderx) +Group: System/Kernel +BuildRequires: %{kernel_module_package_buildreqs} +%suse_kernel_module_package -p %{_sourcedir}/preamble pae 64kb + +%description kmp +The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the Linux* control plane. + %define sdkdir %{_datadir}/dpdk %define docdir %{_docdir}/dpdk %define incdir %{_includedir}/dpdk @@ -171,9 +181,6 @@ setconf CONFIG_RTE_LIBRTE_PMD_PCAP y setconf CONFIG_RTE_LIBRTE_VHOST_NUMA y setconf CONFIG_RTE_EAL_IGB_UIO n -setconf CONFIG_RTE_LIBRTE_KNI n -setconf CONFIG_RTE_KNI_KMOD n -setconf CONFIG_RTE_KNI_PREEMPT_DEFAULT n %if %{with shared} setconf CONFIG_RTE_BUILD_SHARED_LIB y @@ -185,6 +192,13 @@ setconf CONFIG_RTE_LIBRTE_DISTRIBUTOR n %ifarch ppc64le setconf CONFIG_RTE_LIBRTE_PMD_RING n %endif +export EXTRA_CFLAGS='-DVERSION=\"%{version}\"' +for flavor in %{flavors_to_build}; do + cp -r %{target} %{target}-$flavor + cd %{target}-$flavor + make CC=gcc-6 KERNELDIR=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor %{?_smp_mflags} + cd - +done make CC=gcc-6 V=1 O=%{target} %{?_smp_mflags} make CC=gcc-6 V=1 O=%{target} %{?_smp_mflags} doc-api-html @@ -194,6 +208,19 @@ make CC=gcc-6 V=1 O=%{target}/examples T=%{target} %{?_smp_mflags} examples %endif %install +# export needed for kmp package +export EXTRA_CFLAGS='-DVERSION=\"%{version}\"' +export INSTALL_MOD_PATH=%{buildroot} +export INSTALL_MOD_DIR=updates +# needssslcertforbuild +export BRP_PESIGN_FILES="*.ko" + +for flavor in %{flavors_to_build}; do + cd %{target}-$flavor + %make_install KERNELDIR=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor prefix=%{_usr} libdir=%{_libdir} + cd - +done + # In case dpdk-devel is installed unset RTE_SDK RTE_INCLUDE RTE_TARGET @@ -251,7 +278,7 @@ ln -s %{_bindir}/dpdk-procinfo %{buildroot}%{_bindir}/dpdk_proc_info ln -s %{_sbindir}/dpdk-devbind %{buildroot}%{_sbindir}/dpdk_nic_bind # Remove duplicates -%fdupes %{buildroot}/%{_prefix} +%fdupes %{buildroot}/%{_prefix} %post devel -p /sbin/ldconfig %postun devel -p /sbin/ldconfig @@ -277,7 +304,7 @@ ln -s %{_sbindir}/dpdk-devbind %{buildroot}%{_sbindir}/dpdk_nic_bind %defattr(-,root,root) #BSD %docdir -%doc LICENSE.GPL LICENSE.LGPL +%doc LICENSE.GPL LICENSE.LGPL %files devel %defattr(-,root,root) diff --git a/dpdk.changes b/dpdk.changes index 384312e..d8edad8 100644 --- a/dpdk.changes +++ b/dpdk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 10 11:24:27 CET 2017 - ndas@suse.de + +- Enable rte_kni kernel module for dpdk(fate#322394). + [+preamble] + ------------------------------------------------------------------- Thu Feb 2 15:21:14 CET 2017 - ndas@suse.de diff --git a/dpdk.spec b/dpdk.spec index 3d46d6f..c7ef208 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -22,7 +22,7 @@ %define machine native %define target x86_64-%{machine}-linuxapp-gcc %endif -%ifarch %ix86 +%ifarch %{ix86} %define machine native %define target i686-%{machine}-linuxapp-gcc %endif @@ -34,7 +34,6 @@ %define machine2 power8 %define target ppc_64-%{machine2}-linuxapp-gcc %endif - %bcond_without shared # Add option to build without examples %bcond_without examples @@ -48,6 +47,7 @@ License: BSD-3-Clause and GPL-2.0 and LGPL-2.1 Group: System/Libraries Url: http://dpdk.org Source: http://fast.dpdk.org/rel/dpdk-%{version}.tar.xz +Source1: preamble # PATCH-FIX-OPENSUSE 0001-enic-fix-Type-punning-and-strict-aliasing-warning.patch # This patch was originally taken from the fedora package but they have # removed it since then because of @@ -60,6 +60,7 @@ BuildRequires: fdupes BuildRequires: gcc6 BuildRequires: libnuma-devel BuildRequires: libpcap-devel +BuildRequires: pesign-obs-integration BuildRequires: zlib-devel ExclusiveArch: aarch64 x86_64 %ix86 ppc64le Provides: dpdk-any = %{version} @@ -119,6 +120,15 @@ Example applications utilizing the Data Plane Development Kit, such as L2 and L3 forwarding. %endif +%package kmp +Summary: DPDK KNI kernel module +Group: System/Kernel +BuildRequires: %{kernel_module_package_buildreqs} +%suse_kernel_module_package -p %{_sourcedir}/preamble pae 64kb + +%description kmp +The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the Linux* control plane. + %define sdkdir %{_datadir}/dpdk %define docdir %{_docdir}/dpdk %define incdir %{_includedir}/dpdk @@ -169,9 +179,6 @@ setconf CONFIG_RTE_LIBRTE_PMD_PCAP y setconf CONFIG_RTE_LIBRTE_VHOST_NUMA y setconf CONFIG_RTE_EAL_IGB_UIO n -setconf CONFIG_RTE_LIBRTE_KNI n -setconf CONFIG_RTE_KNI_KMOD n -setconf CONFIG_RTE_KNI_PREEMPT_DEFAULT n %if %{with shared} setconf CONFIG_RTE_BUILD_SHARED_LIB y @@ -183,6 +190,13 @@ setconf CONFIG_RTE_LIBRTE_DISTRIBUTOR n %ifarch ppc64le setconf CONFIG_RTE_LIBRTE_PMD_RING n %endif +export EXTRA_CFLAGS='-DVERSION=\"%{version}\"' +for flavor in %{flavors_to_build}; do + cp -r %{target} %{target}-$flavor + cd %{target}-$flavor + make CC=gcc-6 KERNELDIR=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor %{?_smp_mflags} + cd - +done make CC=gcc-6 V=1 O=%{target} %{?_smp_mflags} make CC=gcc-6 V=1 O=%{target} %{?_smp_mflags} doc-api-html @@ -192,6 +206,19 @@ make CC=gcc-6 V=1 O=%{target}/examples T=%{target} %{?_smp_mflags} examples %endif %install +# export needed for kmp package +export EXTRA_CFLAGS='-DVERSION=\"%{version}\"' +export INSTALL_MOD_PATH=%{buildroot} +export INSTALL_MOD_DIR=updates +# needssslcertforbuild +export BRP_PESIGN_FILES="*.ko" + +for flavor in %{flavors_to_build}; do + cd %{target}-$flavor + %make_install KERNELDIR=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor prefix=%{_usr} libdir=%{_libdir} + cd - +done + # In case dpdk-devel is installed unset RTE_SDK RTE_INCLUDE RTE_TARGET @@ -249,7 +276,7 @@ ln -s %{_bindir}/dpdk-procinfo %{buildroot}%{_bindir}/dpdk_proc_info ln -s %{_sbindir}/dpdk-devbind %{buildroot}%{_sbindir}/dpdk_nic_bind # Remove duplicates -%fdupes %{buildroot}/%{_prefix} +%fdupes %{buildroot}/%{_prefix} %post devel -p /sbin/ldconfig %postun devel -p /sbin/ldconfig @@ -275,7 +302,7 @@ ln -s %{_sbindir}/dpdk-devbind %{buildroot}%{_sbindir}/dpdk_nic_bind %defattr(-,root,root) #BSD %docdir -%doc LICENSE.GPL LICENSE.LGPL +%doc LICENSE.GPL LICENSE.LGPL %files devel %defattr(-,root,root) diff --git a/preamble b/preamble new file mode 100644 index 0000000..e568a07 --- /dev/null +++ b/preamble @@ -0,0 +1,3 @@ +Requires: kernel-%1 +Enhances: kernel-%1 +Supplements: packageand(kernel-%1:%{-n*}) From 7c93a673abed07708339e64702db52f90d4fb69dac4b8443a6632653db357c5b Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 15 Feb 2017 16:11:14 +0000 Subject: [PATCH 4/4] Accepting request 457472 from home:ndas:branches:network - Build dpdk-thunderx only for aarch64 - Build dpdk-thunderx only for aarch64 OBS-URL: https://build.opensuse.org/request/show/457472 OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=31 --- dpdk-thunderx.changes | 1 + dpdk-thunderx.spec | 3 ++- dpdk.changes | 1 + dpdk.spec | 1 + pre_checkin.sh | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dpdk-thunderx.changes b/dpdk-thunderx.changes index d8edad8..f8877f9 100644 --- a/dpdk-thunderx.changes +++ b/dpdk-thunderx.changes @@ -3,6 +3,7 @@ Fri Feb 10 11:24:27 CET 2017 - ndas@suse.de - Enable rte_kni kernel module for dpdk(fate#322394). [+preamble] +- Build dpdk-thunderx only for aarch64 ------------------------------------------------------------------- Thu Feb 2 15:21:14 CET 2017 - ndas@suse.de diff --git a/dpdk-thunderx.spec b/dpdk-thunderx.spec index b3293b0..7957c09 100644 --- a/dpdk-thunderx.spec +++ b/dpdk-thunderx.spec @@ -64,7 +64,7 @@ BuildRequires: libnuma-devel BuildRequires: libpcap-devel BuildRequires: pesign-obs-integration BuildRequires: zlib-devel -ExclusiveArch: aarch64 x86_64 %ix86 ppc64le +ExclusiveArch: aarch64 Provides: dpdk-any = %{version} Conflicts: otherproviders(dpdk-any) @@ -126,6 +126,7 @@ as L2 and L3 forwarding. Summary: DPDK KNI kernel module (thunderx) Group: System/Kernel BuildRequires: %{kernel_module_package_buildreqs} +Conflicts: otherproviders(dpdk-any-kmp) %suse_kernel_module_package -p %{_sourcedir}/preamble pae 64kb %description kmp diff --git a/dpdk.changes b/dpdk.changes index d8edad8..f8877f9 100644 --- a/dpdk.changes +++ b/dpdk.changes @@ -3,6 +3,7 @@ Fri Feb 10 11:24:27 CET 2017 - ndas@suse.de - Enable rte_kni kernel module for dpdk(fate#322394). [+preamble] +- Build dpdk-thunderx only for aarch64 ------------------------------------------------------------------- Thu Feb 2 15:21:14 CET 2017 - ndas@suse.de diff --git a/dpdk.spec b/dpdk.spec index c7ef208..e46a436 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -124,6 +124,7 @@ as L2 and L3 forwarding. Summary: DPDK KNI kernel module Group: System/Kernel BuildRequires: %{kernel_module_package_buildreqs} +Conflicts: otherproviders(dpdk-any-kmp) %suse_kernel_module_package -p %{_sourcedir}/preamble pae 64kb %description kmp diff --git a/pre_checkin.sh b/pre_checkin.sh index 4061ca4..8694d28 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -16,4 +16,5 @@ sed -i -e "/^Name:.*dpdk$/i \ -e "/^Name:/s/dpdk/&-thunderx/g" \ -e "/^Summary:/s/^.*$/&\ \(thunderx\)/g" \ -e "/^%define machine2 armv8a/s/armv8a/thunderx/g" \ +-e "/ExclusiveArch/c\ExclusiveArch: aarch64" \ dpdk-thunderx.spec || exit 1