Accepting request 685398 from network
OBS-URL: https://build.opensuse.org/request/show/685398 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpdk?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c65431d6b6
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 8 11:50:03 CET 2019 - ndas@suse.de
|
||||
|
||||
- remove -Wno-error=array-bounds as its no longer needed
|
||||
- disable i586 build because lack of sse support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 22 10:57:13 CET 2019 - ndas@suse.de
|
||||
|
||||
|
||||
@ -23,10 +23,6 @@
|
||||
%define machine native
|
||||
%define target x86_64-%{machine}-linuxapp-gcc
|
||||
%endif
|
||||
%ifarch %{ix86}
|
||||
%define machine native
|
||||
%define target i686-%{machine}-linuxapp-gcc
|
||||
%endif
|
||||
%ifarch aarch64
|
||||
%define machine2 thunderx
|
||||
%define target arm64-%{machine2}-linuxapp-gcc
|
||||
@ -136,7 +132,6 @@ 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
|
||||
@ -146,7 +141,6 @@ 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
|
||||
@ -217,9 +211,7 @@ function setdefaultconf()
|
||||
# In case dpdk-devel is installed, we should ignore its hints about the SDK directories
|
||||
unset RTE_SDK RTE_INCLUDE RTE_TARGET
|
||||
|
||||
# For the release, '-Wno-error=array-bounds' is done to prevent a spurious error
|
||||
# generated by gcc 5.X against the 2.1 branch
|
||||
export EXTRA_CFLAGS="%{optflags} -Wformat -fPIC -Wno-error=array-bounds"
|
||||
export EXTRA_CFLAGS="%{optflags} -Wformat -fPIC -U_FORTIFY_SOURCE"
|
||||
|
||||
# DPDK defaults to using builder-specific compiler flags. However,
|
||||
# the config has been changed by specifying CONFIG_RTE_MACHINE=default
|
||||
@ -230,21 +222,17 @@ export EXTRA_CFLAGS="%{optflags} -Wformat -fPIC -Wno-error=array-bounds"
|
||||
make V=1 O=%{target} T=%{target} %{?_smp_mflags} config
|
||||
setdefaultconf %{target}
|
||||
|
||||
%ifnarch %{ix86}
|
||||
export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
|
||||
for flavor in %{flavors_to_build}; do
|
||||
export RTE_KERNELDIR=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor
|
||||
make V=1 O=%{target}-$flavor T=%{target} %{?_smp_mflags} config
|
||||
setdefaultconf %{target}-$flavor
|
||||
%ifnarch %{ix86}
|
||||
setconf CONFIG_RTE_EAL_IGB_UIO y %{target}-$flavor
|
||||
setconf CONFIG_RTE_KNI_KMOD y %{target}-$flavor
|
||||
%endif
|
||||
cd %{target}-$flavor
|
||||
make V=1 %{?_smp_mflags}
|
||||
cd -
|
||||
done
|
||||
%endif
|
||||
|
||||
make V=1 O=%{target} %{?_smp_mflags}
|
||||
make V=1 O=%{target} %{?_smp_mflags} doc-api-html
|
||||
@ -254,7 +242,6 @@ make 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}
|
||||
@ -271,7 +258,6 @@ for flavor in %{flavors_to_build}; do
|
||||
install -m644 ../%{target}-$flavor/kmod/*.ko %{buildroot}/lib/modules/$krel/extra/dpdk/
|
||||
cd -
|
||||
done
|
||||
%endif
|
||||
# In case dpdk-devel is installed
|
||||
unset RTE_SDK RTE_INCLUDE RTE_TARGET
|
||||
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 8 11:50:03 CET 2019 - ndas@suse.de
|
||||
|
||||
- remove -Wno-error=array-bounds as its no longer needed
|
||||
- disable i586 build because lack of sse support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 22 10:57:13 CET 2019 - ndas@suse.de
|
||||
|
||||
|
||||
18
dpdk.spec
18
dpdk.spec
@ -23,10 +23,6 @@
|
||||
%define machine native
|
||||
%define target x86_64-%{machine}-linuxapp-gcc
|
||||
%endif
|
||||
%ifarch %{ix86}
|
||||
%define machine native
|
||||
%define target i686-%{machine}-linuxapp-gcc
|
||||
%endif
|
||||
%ifarch aarch64
|
||||
%define machine2 armv8a
|
||||
%define target arm64-%{machine2}-linuxapp-gcc
|
||||
@ -67,7 +63,7 @@ BuildRequires: pesign-obs-integration
|
||||
BuildRequires: rdma-core-devel
|
||||
%endif
|
||||
BuildRequires: zlib-devel
|
||||
ExclusiveArch: aarch64 x86_64 %ix86 ppc64le
|
||||
ExclusiveArch: aarch64 x86_64 ppc64le
|
||||
Provides: dpdk-any = %{version}
|
||||
Conflicts: otherproviders(dpdk-any)
|
||||
|
||||
@ -134,7 +130,6 @@ 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
|
||||
@ -144,7 +139,6 @@ 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
|
||||
@ -215,9 +209,7 @@ function setdefaultconf()
|
||||
# In case dpdk-devel is installed, we should ignore its hints about the SDK directories
|
||||
unset RTE_SDK RTE_INCLUDE RTE_TARGET
|
||||
|
||||
# For the release, '-Wno-error=array-bounds' is done to prevent a spurious error
|
||||
# generated by gcc 5.X against the 2.1 branch
|
||||
export EXTRA_CFLAGS="%{optflags} -Wformat -fPIC -Wno-error=array-bounds"
|
||||
export EXTRA_CFLAGS="%{optflags} -Wformat -fPIC -U_FORTIFY_SOURCE"
|
||||
|
||||
# DPDK defaults to using builder-specific compiler flags. However,
|
||||
# the config has been changed by specifying CONFIG_RTE_MACHINE=default
|
||||
@ -228,21 +220,17 @@ export EXTRA_CFLAGS="%{optflags} -Wformat -fPIC -Wno-error=array-bounds"
|
||||
make V=1 O=%{target} T=%{target} %{?_smp_mflags} config
|
||||
setdefaultconf %{target}
|
||||
|
||||
%ifnarch %{ix86}
|
||||
export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
|
||||
for flavor in %{flavors_to_build}; do
|
||||
export RTE_KERNELDIR=%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor
|
||||
make V=1 O=%{target}-$flavor T=%{target} %{?_smp_mflags} config
|
||||
setdefaultconf %{target}-$flavor
|
||||
%ifnarch %{ix86}
|
||||
setconf CONFIG_RTE_EAL_IGB_UIO y %{target}-$flavor
|
||||
setconf CONFIG_RTE_KNI_KMOD y %{target}-$flavor
|
||||
%endif
|
||||
cd %{target}-$flavor
|
||||
make V=1 %{?_smp_mflags}
|
||||
cd -
|
||||
done
|
||||
%endif
|
||||
|
||||
make V=1 O=%{target} %{?_smp_mflags}
|
||||
make V=1 O=%{target} %{?_smp_mflags} doc-api-html
|
||||
@ -252,7 +240,6 @@ make 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}
|
||||
@ -269,7 +256,6 @@ for flavor in %{flavors_to_build}; do
|
||||
install -m644 ../%{target}-$flavor/kmod/*.ko %{buildroot}/lib/modules/$krel/extra/dpdk/
|
||||
cd -
|
||||
done
|
||||
%endif
|
||||
# In case dpdk-devel is installed
|
||||
unset RTE_SDK RTE_INCLUDE RTE_TARGET
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user