From c0c875bb435bbaa878fc3a90ca154a93d719711c Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Tue, 25 Jul 2017 19:26:08 -0400
Subject: Add 17.05 and 17.08-rc releases.

Minor cleanup.
Make copyrights consistent between two files from OPNFV.

Change-Id: Ic3b26a0fedf055b5256929bfdd709545a7beb055
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 build/build.sh            | 35 +++++++++++++++++++++++++++++++++++
 build/build_dpdk_rpm.sh   | 17 ++++++++++++-----
 build/dpdk-snap/dpdk.spec |  3 +++
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/build/build.sh b/build/build.sh
index 5714621..34ba900 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -15,10 +15,12 @@
 #    limitations under the License.
 set -e
 
+echo =============================16.07================================
 echo "Build DPDK RPM for 16.07 release"
 
 ./build_dpdk_rpm.sh -g 16.07
 
+echo =============================16.11================================
 echo "Build DPDK RPM for 16.11 release"
 
 ./build_dpdk_rpm.sh -g 16.11 -p yes
@@ -27,6 +29,7 @@ echo "Build DPDK SRPM for 16.11 release"
 
 ./build_dpdk_rpm.sh -g 16.11 -p yes -s yes
 
+echo =============================17.02================================
 echo "Build DPDK RPM for 17.02 release"
 
 ./build_dpdk_rpm.sh -g 17.02
@@ -37,10 +40,42 @@ echo "Build DPDK SRPM for 17.02 release"
 
 echo "Build DPDK RPM from snapshot of master"
 
+echo =============================17.05================================
+echo "Build DPDK RPM for 17.05 release"
+
+./build_dpdk_rpm.sh -g 17.05
+
+echo "Build DPDK SRPM for 17.05 release"
+
+./build_dpdk_rpm.sh -g 17.05 -s yes
+
+echo =============================17.08-rc1================================
+echo "Build DPDK RPM for 17.08-rc1 release"
+
+./build_dpdk_rpm.sh -g 17.08-rc1
+
+echo "Build DPDK SRPM for 17.08-rc1 release"
+
+./build_dpdk_rpm.sh -g 17.08-rc1 -s yes
+
+echo =============================17.08-rc2================================
+echo "Build DPDK RPM for 17.08-rc2 release"
+
+./build_dpdk_rpm.sh -g 17.08-rc2
+
+echo "Build DPDK SRPM for 17.08-rc2 release"
+
+./build_dpdk_rpm.sh -g 17.08-rc2 -s yes
+
+echo =============================Current master================================
+echo "Build DPDK RPM from snapshot of master"
 ./build_dpdk_rpm.sh -g master
 
 echo "Build DPDK SRPM from snapshot of master"
 ./build_dpdk_rpm.sh -g master -s yes
+
+
+echo =============================Clean up temporary directories================================
 ./clean.sh
 
 exit 0
diff --git a/build/build_dpdk_rpm.sh b/build/build_dpdk_rpm.sh
index e4e53d6..4123325 100755
--- a/build/build_dpdk_rpm.sh
+++ b/build/build_dpdk_rpm.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
-# Copyright (c) 2016 Red Hat, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -113,17 +112,25 @@ else
     git checkout v$DPDK_VERSION
 fi
 
+if [[ "$DPDK_VERSION" =~ "rc" ]]; then
+    DPDK_VERSION=`echo $DPDK_VERSION | sed -e 's/-/_/'`
+fi
+
 cp $HOME/dpdk-snap/* $RPMDIR/SOURCES
 snapser=`git log --pretty=oneline | wc -l`
 
 makever=`make showversion`
 basever=`echo ${makever} | cut -d- -f1`
+rc=`echo ${makever} | cut -d- -f2 -s`
 snapver=${snapser}.git${snapgit}
 
 
 if [[ "$DPDK_VERSION" =~ "master" ]]; then
     prefix=dpdk-${basever}.${snapser}.git${snapgit}
     cp $HOME/dpdk-snap/dpdk.spec $TMPDIR/dpdk/dpdk.spec
+elif [ ! -z "$rc" ]; then
+    prefix=dpdk-${basever:0:5}_${rc}
+    cp $HOME/dpdk-snap/dpdk.spec $TMPDIR/dpdk/dpdk.spec
 else
     prefix=dpdk-${basever:0:5}
     if [[ "$DPDK_PATCH"  =~ "yes" && "$DPDK_VERSION" =~ "16.11" ]]; then
@@ -151,8 +158,8 @@ if [[ ! "${SRC}dummy" == "dummy" ]]; then
     BUILD_OPT=(-bs --define "dist .el7")
     if [[ "$DPDK_VERSION" =~ "master" ]]; then
         sed -i "/%define ver.*/c\\
-%define ver ${basever}\\
-%define _snapver ${snapver}" $TMPDIR/dpdk/dpdk.spec
+                %define ver ${basever}\\
+                %define _snapver ${snapver}" $TMPDIR/dpdk/dpdk.spec
     else
         sed -i "s/%define ver.*/%define ver ${DPDK_VERSION}/" $TMPDIR/dpdk/dpdk.spec
     fi
@@ -173,9 +180,9 @@ echo
 echo DPDK_VERSION is $DPDK_VERSION
 
 if [[ "$DPDK_VERSION" =~ "master" ]]; then
-    rpmbuild "${BUILD_OPT[@]}" -vv --define "_topdir $RPMDIR" --define "_snapver $snapver" --define "_ver $basever" dpdk.spec
+    rpmbuild "${BUILD_OPT[@]}" --define "_topdir $RPMDIR" --define "_snapver $snapver" --define "_ver $basever" dpdk.spec
 else
-    rpmbuild "${BUILD_OPT[@]}" -vv --define "_topdir $RPMDIR" --define "_ver $DPDK_VERSION" dpdk.spec
+    rpmbuild "${BUILD_OPT[@]}" --define "_topdir $RPMDIR" --define "_ver $DPDK_VERSION" dpdk.spec
 fi
 
 #
diff --git a/build/dpdk-snap/dpdk.spec b/build/dpdk-snap/dpdk.spec
index f6dbedd..72f0b70 100644
--- a/build/dpdk-snap/dpdk.spec
+++ b/build/dpdk-snap/dpdk.spec
@@ -250,6 +250,9 @@ sed -i -e 's:-%{machine_tmpl}-:-%{machine}-:g' %{buildroot}/%{_sysconfdir}/profi
 %endif
 
 %changelog
+* Wed Jul 26 2017 Thomas F Herbert <therbert@tedhat.com> 17.08
+- Build 17.05, 17.08-rc1 and 17.08-rc2
+
 * Mon Feb 27 2017 Thomas F Herbert <therbert@tedhat.com> 17.02.0-1
 - New usertools dir. Remove override of default gcc flags.
 
-- 
cgit 1.2.3-korg