Architecture specific change in rpms/dpdk.git

The package rpms/dpdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dpdk.git/commit/?id=58b352af2dd6692b...
https://src.fedoraproject.org/cgit/rpms/dpdk.git/commit/?id=b4b1e24f29589cee...
https://src.fedoraproject.org/cgit/rpms/dpdk.git/commit/?id=634d97f252f58b91....

Change:
+%ifarch aarch64
+%ifarch x86_64 i686
+%ifarch x86_64 i686

Thanks.

Full change:
============

commit 22f7f4248c0ccf9d2a103413f6a5c0a9cc13ff2a
Merge: be1dc26 b4b1e24
Author: Neil Horman 
Date:   Fri Sep 28 14:11:53 2018 -0400

Merge branch 'master' into f28

diff --cc dpdk.spec
index 7ea33a3,4a4e68c..70fcb05
--- a/dpdk.spec
+++ b/dpdk.spec
@@@ -9,11 -9,13 +9,12 @@@

Name: dpdk
  Version: 17.11.2
- Release: 1%{?dist}
 -Release: 3%{?dist}
++Release: 2%{?dist}
  Epoch: 2
  URL: http://dpdk.org
  Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
- #Patch0: dpdk-dpaa-build.patch
 -
+ Patch0: app-pie.patch
+ Patch1: fcf-protection.patch

Summary: Set of libraries and drivers for fast packet processing

@@@ -290,17 -309,26 +307,20 @@@ sed -i -e 's:-%{machine_tmpl}-:-%{machi
  %endif

%changelog
 -* Thu Sep 27 2018 Neil Horman  - 2:17.11.2-3
 -- quiet annocheck complaints (bz1548404)
 -
 -* Thu Jul 12 2018 Fedora Release Engineering  - 2:17.11.2-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
++* Fri Sep 28 2018 Neil Horman  - 2:17.11.2-2
++- Fix build flags (bz 1548404)
+ 
 -* Tue Apr 24 2018 Neil Horman  2:17.11.2-1
 -- Update to latest 17.11 LTS (fixes bz 1571361)
 +* Tue Apr 24 2018 Neil Horman  - 2:17.11.2-1
 +- Update to latest 17.11 LTS (fixes bz 1571352)

-* Tue Apr 10 2018 Timothy Redaelli  - 2:17.11.1-3
 -- Fix Requires dpdk by adding epoch
 +* Tue Apr 10 2018 Timothy Redaelli  - 2:17.11.1-2
 +- Fix Requires dpdk by adding epoch (bz 1564215)

-* Fri Apr 06 2018 Neil Horman  2:17.11.1-2
 -- Fix aarch64 build issue
 +* Mon Apr 09 2018 Neil Horman  - 17.11.1-1 
 +- sync rawhide updates (including LTS shift) with f28 (bz 1564215)

-* Fri Apr 06 2018 Neil Horman  2:17.11.1-1
 -- Update to latest LTS release for OVS
 -
 -* Fri Apr 06 2018 Timothy Redaelli  -  18.02 -6
 -- Replace "/usr/bin/env python" with "/usr/bin/python3" (bz 1564215)
 +* Thu Apr 05 2018 Neil Horman  - 18.02-6
 +- Remove some debug checks (bz 1548404)

* Thu Apr 05 2018 Neil Horman  - 18.02-5
  - Fix compiler flag error (bz 1548404)

commit b4b1e24f29589cee5a609adac0e488af1260f2d5
Author: Neil Horman 
Date:   Thu Sep 27 16:13:07 2018 -0400

Resolves: bz 1548404

diff --git a/dpdk.spec b/dpdk.spec
index 1d833ae..4a4e68c 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -155,7 +155,9 @@ EXTRA_RPM_LDFLAGS=$(wdiff -3 -n ./noopts.txt ./opts.txt | sed -e"/^=+$/d" -e"/^
 rm -f obj.o

export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC %{_hardening_ldflags}"
+%ifarch x86_64 i686
 export EXTRA_CFLAGS="$EXTRA_CFLAGS -fcf-protection=full"
+%endif
 export EXTRA_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-Wl,//g' -e's/-spec.*//')
 export HOST_EXTRA_CFLAGS="$EXTRA_CFLAGS $EXTRA_RPM_LDFLAGS"
 export EXTRA_HOST_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-spec.*//')

commit 8160c11c0bff28657f9e7d8d4fce4b3b397eb2c4
Author: Neil Horman 
Date:   Thu Sep 27 14:47:46 2018 -0400

Resolves: bz 1548404

diff --git a/dpdk.spec b/dpdk.spec
index 09e4485..1d833ae 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -122,9 +122,9 @@ as L2 and L3 forwarding.

%prep
 %setup -q -n dpdk-stable-%{version}
-%patch0 -p1 .pie
+%patch0 -p1 
 %ifarch x86_64 i686
-%patch1 -p1 .fcf
+%patch1 -p1
 %endif

%build

commit 634d97f252f58b9119d00ece3b646f148b79bd56
Author: Neil Horman 
Date:   Thu Sep 27 14:41:11 2018 -0400

Resolves: bz1548404

diff --git a/dpdk.spec b/dpdk.spec
index 99744ec..09e4485 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -122,7 +122,10 @@ as L2 and L3 forwarding.

%prep
 %setup -q -n dpdk-stable-%{version}
-%autopatch -p1
+%patch0 -p1 .pie
+%ifarch x86_64 i686
+%patch1 -p1 .fcf
+%endif

%build
 %set_build_flags

commit 29514aa1f7dc7b660f67202b1c9128b49b9b089a
Author: Neil Horman 
Date:   Thu Sep 27 14:25:08 2018 -0400

Resolves: bz 1548404

diff --git a/app-pie.patch b/app-pie.patch
new file mode 100644
index 0000000..5a6c7b0
--- /dev/null
+++ b/app-pie.patch
@@ -0,0 +1,12 @@
+diff -up ./mk/rte.app.mk.pie ./mk/rte.app.mk
+--- ./mk/rte.app.mk.pie	2018-09-24 16:03:22.504850668 -0400
++++ ./mk/rte.app.mk	2018-09-24 16:03:30.898814226 -0400
+@@ -50,7 +50,7 @@ LDSCRIPT = $(RTE_LDSCRIPT)
+ endif
+ 
+ # Link only the libraries used in the application
+-LDFLAGS += --as-needed
++LDFLAGS += --as-needed -pie
+ 
+ # default path for libs
+ _LDLIBS-y += -L$(RTE_SDK_BIN)/lib
diff --git a/dpdk.spec b/dpdk.spec
index f61b40d..99744ec 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -9,11 +9,13 @@

Name: dpdk
 Version: 17.11.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 2
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz

+Patch0: app-pie.patch
+Patch1: fcf-protection.patch

Summary: Set of libraries and drivers for fast packet processing

@@ -120,8 +122,10 @@ as L2 and L3 forwarding.

%prep
 %setup -q -n dpdk-stable-%{version}
+%autopatch -p1

%build
+%set_build_flags
 # set up a method for modifying the resulting .config file
 function setconf() {
    if grep -q ^$1= %{target}/.config; then
@@ -141,9 +145,16 @@ unset RTE_SDK RTE_INCLUDE RTE_TARGET
 # astoundingly convoluted in how it processes its linker flags.  Fixing it in
 # dpdk is the preferred solution, but adjusting to allow a gcc option in the
 # ldflags, even when gcc is used as the linker, requires large tree-wide changes
+touch obj.o
+gcc -### obj.o 2>&1 | awk '/.*collect2.*/ { print $0}' > ./noopts.txt
+gcc -### $(rpm --eval '%{build_ldflags}') obj.o 2>&1 | awk '/.*collect2.*/ {print $0}' > ./opts.txt
+EXTRA_RPM_LDFLAGS=$(wdiff -3 -n ./noopts.txt ./opts.txt | sed -e"/^=+$/d" -e"/^.*.res.*/d" -e"s/[-//g" -e"s/-]//g" -e"s/{+//g" -e"s/+}//g" -e"s//.*.o //g" -e"s/ /.*.o$//g" -e"s/-z .*//g" | tr '\n' ' ')
+rm -f obj.o
+
 export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC %{_hardening_ldflags}"
+export EXTRA_CFLAGS="$EXTRA_CFLAGS -fcf-protection=full"
 export EXTRA_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-Wl,//g' -e's/-spec.*//')
-export HOST_EXTRA_CFLAGS=$EXTRA_CFLAGS
+export HOST_EXTRA_CFLAGS="$EXTRA_CFLAGS $EXTRA_RPM_LDFLAGS"
 export EXTRA_HOST_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-spec.*//')

# DPDK defaults to using builder-specific compiler flags.  However,
@@ -293,6 +304,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Thu Sep 27 2018 Neil Horman  - 2:17.11.2-3
+- quiet annocheck complaints (bz1548404)
+
 * Thu Jul 12 2018 Fedora Release Engineering  - 2:17.11.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

diff --git a/fcf-protection.patch b/fcf-protection.patch
new file mode 100644
index 0000000..ef6c414
--- /dev/null
+++ b/fcf-protection.patch
@@ -0,0 +1,12 @@
+diff -up ./mk/rte.lib.mk.stupid ./mk/rte.lib.mk
+--- ./mk/rte.lib.mk.stupid	2018-09-27 13:45:48.336632453 -0400
++++ ./mk/rte.lib.mk	2018-09-27 13:46:03.900563944 -0400
+@@ -103,7 +103,7 @@ ifneq ($(CC_SUPPORTS_Z),false)
+ NO_UNDEFINED := -z defs
+ endif
+ 
+-O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) \
++O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) -fcf-protection=full \
+ 	  -shared $(OBJS-y) $(NO_UNDEFINED) $(LDLIBS) -Wl,-soname,$(LIB) -o $(LIB)
+ O_TO_S_STR = $(subst ',''',$(O_TO_S)) #'# fix syntax highlight
+ O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)","  LD $(@)")

commit 079deeea6a524621872cd4939b3ceb49a9da8bbb
Author: Fedora Release Engineering 
Date:   Thu Jul 12 23:06:32 2018 +0000

- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering

diff --git a/dpdk.spec b/dpdk.spec
index c07a188..f61b40d 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -9,7 +9,7 @@

Name: dpdk
 Version: 17.11.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
@@ -293,6 +293,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Thu Jul 12 2018 Fedora Release Engineering  - 2:17.11.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Tue Apr 24 2018 Neil Horman  2:17.11.2-1
 - Update to latest 17.11 LTS (fixes bz 1571361)

commit 0df4d4b442d3840d0b46207eb4f6756713ec49be
Author: Neil Horman 
Date:   Tue Apr 24 13:15:37 2018 -0400

Resolves: bz1571361

diff --git a/.gitignore b/.gitignore
index 326699d..9af0e25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /dpdk-17.11.tar.xz
 /dpdk-18.02.tar.xz
 /dpdk-17.11.1.tar.xz
+/dpdk-17.11.2.tar.xz
diff --git a/dpdk.spec b/dpdk.spec
index 3c8caa2..c07a188 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -8,8 +8,8 @@
 %bcond_with pdfdoc

Name: dpdk
-Version: 17.11.1
-Release: 3%{?dist}
+Version: 17.11.2
+Release: 1%{?dist}
 Epoch: 2
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
@@ -293,6 +293,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Tue Apr 24 2018 Neil Horman  2:17.11.2-1
+- Update to latest 17.11 LTS (fixes bz 1571361)
+
 * Tue Apr 10 2018 Timothy Redaelli  - 2:17.11.1-3
 - Fix Requires dpdk by adding epoch

diff --git a/sources b/sources
index d9b7706..1f4a75d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dpdk-17.11.1.tar.xz) = 029235a0d7bcb37825783ba17f0894a3b3d69911daf6f4a5a408d5925d57bff7b691ff0e39ea8d3511b3da6ac71b3c35265a7e0ad51936ecdcb9b5d369cb048d
+SHA512 (dpdk-17.11.2.tar.xz) = 48c7a813258c613a5c815baff4e4a7caf5b5464e2d7af2f8a553dca8b0cec1ea825af86fc031924f7a4b6db0bff4f87803f1a8a99b8d06816dce85754bdd3cc9

commit d15d2d27de9239850270ed391ca88755836acede
Author: Timothy Redaelli 
Date:   Tue Apr 10 11:25:07 2018 +0200

Fix "Requires: dpdk" by adding epoch

Resolves: bz 1564548

diff --git a/dpdk.spec b/dpdk.spec
index 54be11e..3c8caa2 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -9,7 +9,7 @@

Name: dpdk
 Version: 17.11.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 2
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
@@ -77,9 +77,9 @@ fast packet processing in the user space.

%package devel
 Summary: Data Plane Development Kit development files
-Requires: %{name}%{?_isa} = %{version}-%{release} python3
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} python3
 %if ! %{with shared}
-Provides: %{name}-static = %{version}-%{release}
+Provides: %{name}-static = %{epoch}:%{version}-%{release}
 %endif

%description devel
@@ -96,7 +96,7 @@ API programming documentation for the Data Plane Development Kit.
 %if %{with tools}
 %package tools
 Summary: Tools for setting up Data Plane Development Kit environment
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: kmod pciutils findutils iproute python3-pyelftools

%description tools
@@ -293,6 +293,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Tue Apr 10 2018 Timothy Redaelli  - 2:17.11.1-3
+- Fix Requires dpdk by adding epoch
+
 * Fri Apr 06 2018 Neil Horman  2:17.11.1-2
 - Fix aarch64 build issue

commit ef7fe382b627ec582d89bc44c32e56391d9b575e
Author: Neil Horman 
Date:   Fri Apr 6 15:40:10 2018 -0400

Resolves: bz 1564548

diff --git a/dpdk.spec b/dpdk.spec
index 425d4a9..54be11e 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -9,7 +9,7 @@

Name: dpdk
 Version: 17.11.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
@@ -178,9 +178,9 @@ setconf CONFIG_RTE_APP_EVENTDEV n
 setconf CONFIG_RTE_LIBRTE_NFP_PMD y

%ifarch aarch64
-setconf CONFIG_RTE_LIBRTE_DPAA_BUS y
-setconf CONFIG_RTE_LIBRTE_DPAA_MEMPOOL y
-setconf CONFIG_RTE_LIBRTE_DPAA_PMD y
+setconf CONFIG_RTE_LIBRTE_DPAA_BUS n
+setconf CONFIG_RTE_LIBRTE_DPAA_MEMPOOL n
+setconf CONFIG_RTE_LIBRTE_DPAA_PMD n
 %endif

%if %{with shared}
@@ -293,6 +293,12 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Fri Apr 06 2018 Neil Horman  2:17.11.1-2
+- Fix aarch64 build issue
+
+* Fri Apr 06 2018 Neil Horman  2:17.11.1-1
+- Update to latest LTS release for OVS
+
 * Fri Apr 06 2018 Timothy Redaelli  -  18.02 -6
 - Replace "/usr/bin/env python" with "/usr/bin/python3" (bz 1564215)

commit a7fb59aa147731708b12f6a0682a253400d98774
Author: Neil Horman 
Date:   Fri Apr 6 15:18:55 2018 -0400

Update DPDK to LTS release 17.11.1

Note: This requires an EPOCH bump, but is needed to link with OVS

Resolves: bz 1564548

diff --git a/.gitignore b/.gitignore
index 24d1710..326699d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /dpdk-17.08.tar.xz
 /dpdk-17.11.tar.xz
 /dpdk-18.02.tar.xz
+/dpdk-17.11.1.tar.xz
diff --git a/dpdk.spec b/dpdk.spec
index b210084..425d4a9 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -8,11 +8,11 @@
 %bcond_with pdfdoc

Name: dpdk
-Version: 18.02 
-Release: 6%{?dist}
+Version: 17.11.1
+Release: 1%{?dist}
+Epoch: 2
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
-Patch0: dpdk-dpaa-build.patch

Summary: Set of libraries and drivers for fast packet processing
@@ -119,8 +119,7 @@ as L2 and L3 forwarding.
 %define pmddir %{_libdir}/%{name}-pmds

%prep
-%setup -q
-%patch0 -p1
+%setup -q -n dpdk-stable-%{version}

%build
 # set up a method for modifying the resulting .config file
@@ -251,7 +250,6 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %files
 # BSD
 %{_bindir}/testpmd
-%{_bindir}/testbbdev
 %{_bindir}/dpdk-procinfo
 %if %{with shared}
 %{_libdir}/*.so.*
diff --git a/sources b/sources
index 0c34129..d9b7706 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dpdk-18.02.tar.xz) = 51695210a0358cf971fc9b4214d7b43a0d628bb5816ce8a4c6381a4f2b611b76493f015b93a2da469665f82ee9403a7ea7ebff2d2c7a7306b7376ace72baa082
+SHA512 (dpdk-17.11.1.tar.xz) = 029235a0d7bcb37825783ba17f0894a3b3d69911daf6f4a5a408d5925d57bff7b691ff0e39ea8d3511b3da6ac71b3c35265a7e0ad51936ecdcb9b5d369cb048d

commit 52a69879eb300cf65b6664924045dcdadf4a09b0
Author: Timothy Redaelli 
Date:   Fri Apr 6 11:00:06 2018 +0200

Replace "/usr/bin/env python" with "/usr/bin/python3"

Phase 1 of https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3

Resolves: #1564215

diff --git a/dpdk.spec b/dpdk.spec
index eeee5f5..b210084 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -9,7 +9,7 @@

Name: dpdk
 Version: 18.02 
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
 Patch0: dpdk-dpaa-build.patch
@@ -216,6 +216,10 @@ for f in %{target}/examples/*/%{target}/app/*; do
 done
 %endif

+# Replace /usr/bin/env python with /usr/bin/python3
+find %{buildroot}%{sdkdir}/ -name "*.py" -exec \
+  sed -i -e 's|#!\s*/usr/bin/env python|#!/usr/bin/python3|' {} +
+
 # Create a driver directory with symlinks to all pmds
 mkdir -p %{buildroot}/%{pmddir}
 for f in %{buildroot}/%{_libdir}/*_pmd_*.so.*; do
@@ -291,6 +295,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Fri Apr 06 2018 Timothy Redaelli  -  18.02 -6
+- Replace "/usr/bin/env python" with "/usr/bin/python3" (bz 1564215)
+
 * Thu Apr 05 2018 Neil Horman  - 18.02-5
 - Fix compiler flag error (bz 1548404)
 - Update spec file to switch to python3

commit a6e5133304d91ab322a70a478bb08edbc8291621
Author: Neil Horman 
Date:   Thu Apr 5 14:12:59 2018 -0400

Resolves: bz 1564215

diff --git a/dpdk.spec b/dpdk.spec
index f8fba9a..eeee5f5 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -9,7 +9,7 @@

Name: dpdk
 Version: 18.02 
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
 Patch0: dpdk-dpaa-build.patch
@@ -59,7 +59,7 @@ ExclusiveArch: x86_64 i686 aarch64 ppc64le
 %define target %{machine_arch}-%{machine_tmpl}-linuxapp-gcc

BuildRequires: gcc
-BuildRequires: kernel-headers, libpcap-devel, doxygen, python2-sphinx, zlib-devel
+BuildRequires: kernel-headers, libpcap-devel, doxygen, python3-sphinx, zlib-devel
 BuildRequires: numactl-devel
 %if %{with pdfdoc}
 BuildRequires: texlive-dejavu inkscape texlive-latex-bin-bin
@@ -77,7 +77,7 @@ fast packet processing in the user space.

%package devel
 Summary: Data Plane Development Kit development files
-Requires: %{name}%{?_isa} = %{version}-%{release} python2
+Requires: %{name}%{?_isa} = %{version}-%{release} python3
 %if ! %{with shared}
 Provides: %{name}-static = %{version}-%{release}
 %endif
@@ -97,7 +97,7 @@ API programming documentation for the Data Plane Development Kit.
 %package tools
 Summary: Tools for setting up Data Plane Development Kit environment
 Requires: %{name} = %{version}-%{release}
-Requires: kmod pciutils findutils iproute python2-pyelftools
+Requires: kmod pciutils findutils iproute python3-pyelftools

%description tools
 %{summary}
@@ -145,7 +145,7 @@ unset RTE_SDK RTE_INCLUDE RTE_TARGET
 export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC %{_hardening_ldflags}"
 export EXTRA_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-Wl,//g' -e's/-spec.*//')
 export HOST_EXTRA_CFLAGS=$EXTRA_CFLAGS
-export EXTRA_HOST_LDFLAGS=$EXTRA_LDFLAGS
+export EXTRA_HOST_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-spec.*//')

# DPDK defaults to using builder-specific compiler flags.  However,
 # the config has been changed by specifying CONFIG_RTE_MACHINE=default
@@ -291,6 +291,10 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Thu Apr 05 2018 Neil Horman  - 18.02-5
+- Fix compiler flag error (bz 1548404)
+- Update spec file to switch to python3
+
 * Wed Mar 14 2018 Neil Horman < -18.02-4
 - Fixing date in changelog below

commit a8d196430ac8837b13e506f71752e1c46ed0bdaf
Author: Neil Horman 
Date:   Wed Mar 14 07:29:05 2018 -0400

Fixing date in changelog

diff --git a/dpdk.spec b/dpdk.spec
index 96d3f8b..f8fba9a 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -9,7 +9,7 @@

Name: dpdk
 Version: 18.02 
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
 Patch0: dpdk-dpaa-build.patch
@@ -291,7 +291,10 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
-* Tue Mar 08 2018 Neil Horman  - 18.02-3
+* Wed Mar 14 2018 Neil Horman < -18.02-4
+- Fixing date in changelog below
+
+* Thu Mar 08 2018 Neil Horman  - 18.02-3
 - Fixing missing c/ldflags for pmdinfogen (bz 1548404)

* Tue Feb 27 2018 Neil Horman  - 18.02-2

commit 0fbd33669c3033f21aa927d73915bab18aba36fd
Author: Neil Horman 
Date:   Thu Mar 8 13:46:04 2018 -0500

Resolves: 1548404

diff --git a/dpdk.spec b/dpdk.spec
index 25436df..96d3f8b 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -9,7 +9,7 @@

Name: dpdk
 Version: 18.02 
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
 Patch0: dpdk-dpaa-build.patch
@@ -144,6 +144,8 @@ unset RTE_SDK RTE_INCLUDE RTE_TARGET
 # ldflags, even when gcc is used as the linker, requires large tree-wide changes
 export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC %{_hardening_ldflags}"
 export EXTRA_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-Wl,//g' -e's/-spec.*//')
+export HOST_EXTRA_CFLAGS=$EXTRA_CFLAGS
+export EXTRA_HOST_LDFLAGS=$EXTRA_LDFLAGS

# DPDK defaults to using builder-specific compiler flags.  However,
 # the config has been changed by specifying CONFIG_RTE_MACHINE=default
@@ -289,6 +291,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Tue Mar 08 2018 Neil Horman  - 18.02-3
+- Fixing missing c/ldflags for pmdinfogen (bz 1548404)
+
 * Tue Feb 27 2018 Neil Horman  - 18.02-2
 - Fix rpm ldflags usage (bz 1548404)

commit 0a1db0d33b4ea4231d6407b0535eb78655bcc751
Author: Neil Horman 
Date:   Tue Feb 27 16:03:58 2018 -0500

Resolves bz 1548404

diff --git a/dpdk.spec b/dpdk.spec
index fc1b7d8..25436df 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -143,7 +143,7 @@ unset RTE_SDK RTE_INCLUDE RTE_TARGET
 # dpdk is the preferred solution, but adjusting to allow a gcc option in the
 # ldflags, even when gcc is used as the linker, requires large tree-wide changes
 export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC %{_hardening_ldflags}"
-export EXTRA_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-Wl,//' -e's/,/ /g' -e's/-spec.*//')
+export EXTRA_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-Wl,//g' -e's/-spec.*//')

# DPDK defaults to using builder-specific compiler flags.  However,
 # the config has been changed by specifying CONFIG_RTE_MACHINE=default

commit c859593f9422fc2cbbedec0542deceaee9cc28d4
Author: Neil Horman 
Date:   Tue Feb 27 15:25:53 2018 -0500

Resolves bz 1548404

diff --git a/dpdk.spec b/dpdk.spec
index 78a793e..fc1b7d8 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -13,7 +13,6 @@ Release: 2%{?dist}
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
 Patch0: dpdk-dpaa-build.patch
-Patch1: dpdk-extra-ldflags.patch

Summary: Set of libraries and drivers for fast packet processing

commit ad4ae461098246b037a6142e1cc1d87c71bd4330
Author: Neil Horman 
Date:   Tue Feb 27 15:25:30 2018 -0500

Resolves bz 1548404

diff --git a/dpdk.spec b/dpdk.spec
index 6e47bb6..78a793e 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -9,10 +9,11 @@

Name: dpdk
 Version: 18.02 
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
 Patch0: dpdk-dpaa-build.patch
+Patch1: dpdk-extra-ldflags.patch

Summary: Set of libraries and drivers for fast packet processing
@@ -138,7 +139,12 @@ unset RTE_SDK RTE_INCLUDE RTE_TARGET
 # Avoid appending second -Wall to everything, it breaks upstream warning
 # disablers in makefiles. Strip expclit -march= from optflags since they
 # will only guarantee build failures, DPDK is picky with that.
-export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC"
+# Note: _hardening_ldflags has to go on the extra cflags line because dpdk is
+# astoundingly convoluted in how it processes its linker flags.  Fixing it in
+# dpdk is the preferred solution, but adjusting to allow a gcc option in the
+# ldflags, even when gcc is used as the linker, requires large tree-wide changes
+export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC %{_hardening_ldflags}"
+export EXTRA_LDFLAGS=$(echo %{__global_ldflags} | sed -e's/-Wl,//' -e's/,/ /g' -e's/-spec.*//')

# DPDK defaults to using builder-specific compiler flags.  However,
 # the config has been changed by specifying CONFIG_RTE_MACHINE=default
@@ -284,6 +290,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Tue Feb 27 2018 Neil Horman  - 18.02-2
+- Fix rpm ldflags usage (bz 1548404)
+
 * Mon Feb 19 2018 Neil Horman  - 18.02-1
 - update to latest upstream

commit 58b352af2dd6692bb73e9361ecd0ecfd05376141
Author: Neil Horman 
Date:   Mon Feb 26 14:00:08 2018 -0500

Resolves: bz 1545455

diff --git a/.gitignore b/.gitignore
index 6315070..24d1710 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /dpdk-17.05.tar.xz
 /dpdk-17.08.tar.xz
 /dpdk-17.11.tar.xz
+/dpdk-18.02.tar.xz
diff --git a/dpdk-dpaa-build.patch b/dpdk-dpaa-build.patch
new file mode 100644
index 0000000..a8285c0
--- /dev/null
+++ b/dpdk-dpaa-build.patch
@@ -0,0 +1,12 @@
+diff -up ./app/test-pmd/Makefile.arm ./app/test-pmd/Makefile
+--- ./app/test-pmd/Makefile.arm	2018-02-14 13:11:02.000000000 -0500
++++ ./app/test-pmd/Makefile	2018-02-26 12:01:02.999831933 -0500
+@@ -45,7 +45,7 @@ LDLIBS += -lrte_pmd_bond
+ endif
+ 
+ ifeq ($(CONFIG_RTE_LIBRTE_DPAA_PMD),y)
+-LDLIBS += -lrte_pmd_dpaa
++LDLIBS += -lrte_pmd_dpaa -lrte_bus_dpaa -lrte_mempool_dpaa
+ endif
+ 
+ ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
diff --git a/dpdk.spec b/dpdk.spec
index 5c2105a..6e47bb6 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -8,10 +8,11 @@
 %bcond_with pdfdoc

Name: dpdk
-Version: 17.11
-Release: 4%{?dist}
+Version: 18.02 
+Release: 1%{?dist}
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%%7Bversion%7D.tar.xz
+Patch0: dpdk-dpaa-build.patch

Summary: Set of libraries and drivers for fast packet processing
@@ -119,6 +120,7 @@ as L2 and L3 forwarding.

%prep
 %setup -q
+%patch0 -p1

%build
 # set up a method for modifying the resulting .config file
@@ -169,6 +171,12 @@ setconf CONFIG_RTE_APP_EVENTDEV n

setconf CONFIG_RTE_LIBRTE_NFP_PMD y

+%ifarch aarch64
+setconf CONFIG_RTE_LIBRTE_DPAA_BUS y
+setconf CONFIG_RTE_LIBRTE_DPAA_MEMPOOL y
+setconf CONFIG_RTE_LIBRTE_DPAA_PMD y
+%endif
+
 %if %{with shared}
 setconf CONFIG_RTE_BUILD_SHARED_LIB y
 %endif
@@ -232,6 +240,7 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %files
 # BSD
 %{_bindir}/testpmd
+%{_bindir}/testbbdev
 %{_bindir}/dpdk-procinfo
 %if %{with shared}
 %{_libdir}/*.so.*
@@ -275,6 +284,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif

%changelog
+* Mon Feb 19 2018 Neil Horman  - 18.02-1
+- update to latest upstream
+
 * Wed Feb 07 2018 Fedora Release Engineering  - 17.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

diff --git a/sources b/sources
index fb4b6f2..0c34129 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dpdk-17.11.tar.xz) = 0b4dd3ce0dd2c57a0ab4dc8d8f7a27b914d418e48219eecfd6aad123af8ca64515b414385cb512aa5bc1fca6bda429841590f90fcc461821717deaa50545ca8d
+SHA512 (dpdk-18.02.tar.xz) = 51695210a0358cf971fc9b4214d7b43a0d628bb5816ce8a4c6381a4f2b611b76493f015b93a2da469665f82ee9403a7ea7ebff2d2c7a7306b7376ace72baa082