From dcc0fa40f0517e3e24b32d0954ee8245383cf262 Mon Sep 17 00:00:00 2001 From: Thomas F Herbert Date: Sat, 25 Feb 2017 16:42:18 -0500 Subject: Buiild 17.02 Upstream change of tools directory to usertools. Remove override of compile options with CFLAGS. Change-Id: I59f324db1bf15b1c2d806dad0900c4ab46a419b6 Signed-off-by: Thomas F Herbert --- build/dpdk-snap/dpdk.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'build/dpdk-snap/dpdk.spec') diff --git a/build/dpdk-snap/dpdk.spec b/build/dpdk-snap/dpdk.spec index d1d86d8..989c239 100644 --- a/build/dpdk-snap/dpdk.spec +++ b/build/dpdk-snap/dpdk.spec @@ -7,7 +7,7 @@ # Dont edit Version: and Release: directly, only these: %define ver %{?_ver} -%define rel 5 +%define rel 1 # Define when building git snapshots %define srcver %{ver}%{?_snapver:.%{_snapver}} @@ -115,12 +115,6 @@ function setconf() # In case dpdk-devel is installed unset RTE_SDK RTE_INCLUDE RTE_TARGET -# Avoid appending second -Wall to everything, it breaks hand-picked -# disablers like per-file -Wno-strict-aliasing. Strip expclit -march= -# from rpm optflags because they will just make builds fail, DPDK is -# really picky about these things. -export EXTRA_CFLAGS="`echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g'` -Wformat -fPIC" - make V=1 O=%{target} T=%{target} %{?_smp_mflags} config # DPDK defaults to optimizing for the builder host we need generic binaries @@ -174,10 +168,10 @@ done %endif %if ! %{with tools} -rm -rf %{buildroot}%{sdkdir}/tools +rm -rf %{buildroot}%{sdkdir}/usertools rm -rf %{buildroot}%{_sbindir}/dpdk-devbind %endif -rm -f %{buildroot}%{sdkdir}/tools/setup.sh +rm -f %{buildroot}%{sdkdir}/usertools/setup.sh %if %{with examples} find %{target}/examples/ -name "*.map" | xargs rm -f @@ -230,7 +224,7 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi %{incdir}/ %{sdkdir}/ %if %{with tools} -%exclude %{sdkdir}/tools/ +%exclude %{sdkdir}/usertools/ %endif %if %{with examples} %exclude %{sdkdir}/examples/ @@ -251,11 +245,17 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi %if %{with tools} %files tools -%{sdkdir}/tools/ +%{sdkdir}/usertools/ %{_sbindir}/dpdk-devbind %endif %changelog +* Mon Feb 27 2017 Thomas F Herbert 17.02.0-1 +- New usertools dir. Remove override of default gcc flags. + +* Fri Jan 13 2017 Thomas F Herbert 16.11.0-6 +- Applies virtio driver patch to 16.11 + * Fri Dec 30 2016 Thomas F Herbert 16.11.0-5 - Builds 16.07 and 16.11 -- cgit 1.2.3-korg