From c21af4d724480f6e90fa933205b98fcb2b397c1c Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Tue, 27 Dec 2016 11:57:15 -0500
Subject: Builds 16.04 and 16.11.

Change-Id: I144ece2f0336eafd384e05494e5e68b8a20a2ef9
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 build/build.sh            |  7 +++++++
 build/build_dpdk_rpm.sh   | 33 ++++++++++++++++++++++++++++-----
 build/clean.sh            |  5 +++++
 build/dpdk-snap/dpdk.spec | 12 +++++++-----
 4 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/build/build.sh b/build/build.sh
index 3bb3a93..e7e2df4 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -19,6 +19,13 @@ echo "Build DPDK RPM for 16.07 release"
 
 ./build_dpdk_rpm.sh -g 16.07
 
+echo "Build DPDK RPM for 16.11 release"
+
+./build_dpdk_rpm.sh -g 16.11
+
+echo "Build from snapshot of master skipped for now because upstream commits"
+echo "change tool directory locations."
+
 ./clean.sh
 
 exit 0
diff --git a/build/build_dpdk_rpm.sh b/build/build_dpdk_rpm.sh
index 2fc6250..fa90248 100755
--- a/build/build_dpdk_rpm.sh
+++ b/build/build_dpdk_rpm.sh
@@ -117,20 +117,43 @@ snapser=`git log --pretty=oneline | wc -l`
 
 makever=`make showversion`
 basever=`echo ${makever} | cut -d- -f1`
-prefix=dpdk-${basever:0:5}
+snapver=${snapser}.git${snapgit}
 
-archive=${prefix}.tar.gz
-DPDK_VERSION=$basever
+if [[ "$DPDK_VERSION" =~ "master" ]]; then
+    prefix=dpdk-${basever}.${snapser}.git${snapgit}
+    archive=${prefix}.tar.gz
+else
+    prefix=dpdk-${basever:0:5}
+    archive=${prefix}.tar.gz
+fi
 
 echo "-------------------------------"
-echo "Creating ${archive}"
+echo "Creating archive: ${archive}"
 echo
 git archive --prefix=${prefix}/ HEAD  | gzip -9 > ${archive}
 cp ${archive} $RPMDIR/SOURCES/
 echo "-------------------------------"
 echo building RPM for DPDK version $DPDK_VERSION
 echo
+echo DPDK_VERSION is $DPDK_VERSION
 
-rpmbuild -bb -vv --define "_topdir $RPMDIR" --define "_snapver $snapgit" dpdk.spec
+if [[ "$DPDK_VERSION" =~ "master" ]]; then
+    rpmbuild -bb -vv --define "_topdir $RPMDIR" --define "_snapver $snapver" --define "_ver $basever" dpdk.spec
+else
+    rpmbuild -bb -vv --define "_topdir $RPMDIR" --define "_ver $DPDK_VERSION" dpdk.spec
+fi
 
+#
+# Copy all RPMs to build directory
+#
+echo Copy all RPMs to build directory
+cd $RPMDIR
+RPMS=$(find . -type f -iname '*.rpm')
+SRPMS=$(find . -type f -iname '*.srpm')
+SRCRPMS=$(find . -type f -name '*.src.rpm')
+
+for i in $RPMS $SRPMS $SRCRPMS
+do
+    cp $i $HOME
+done
 exit 0
diff --git a/build/clean.sh b/build/clean.sh
index 7acd462..b24f974 100755
--- a/build/clean.sh
+++ b/build/clean.sh
@@ -26,3 +26,8 @@ if [ -d $TMPDIR ]
 then
     rm -rf $TMPDIR
 fi
+
+if [ -d $TOPDIR/rpmbuild ]
+then
+    rm -rf rpmbuild
+fi
diff --git a/build/dpdk-snap/dpdk.spec b/build/dpdk-snap/dpdk.spec
index b26f7fc..7750d72 100644
--- a/build/dpdk-snap/dpdk.spec
+++ b/build/dpdk-snap/dpdk.spec
@@ -1,4 +1,3 @@
-%define ver %{_ver}
 # Add option to build as static libraries (--without shared)
 %bcond_without shared
 # Add option to build without examples
@@ -7,14 +6,14 @@
 %bcond_without tools
 
 # Dont edit Version: and Release: directly, only these:
-%define ver 16.07
-%define rel 4
+%define ver %{?_ver}
+%define rel 5
 # Define when building git snapshots
 
-%define srcver %{ver}%{?_snapver:-%{_snapver}}
+%define srcver %{ver}%{?_snapver:.%{_snapver}}
 
 Name: dpdk
-Version: %{ver}.0
+Version: %{ver}
 Release: %{?_snapver:0.%{_snapver}.}%{rel}%{?dist}
 URL: http://dpdk.org
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{srcver}.tar.gz
@@ -257,6 +256,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif
 
 %changelog
+* Fri Dec 30 2016 Thomas F Herbert <therbert@tedhat.com> 16.11.0-5
+- Builds 16.07, 16.11 and 17.02 snapshot 17.02-6119.git112fc39b
+
 * Tue May 24 2016 Panu Matilainen <pmatilai@redhat.com> - 16.07-0.4560.git587d684d.4
 - Create DT_NEEDED entries for internal library dependencies
 - Fix missing zlib dependency on qede driver
-- 
cgit 1.2.3-korg