From 32c08a8dd4f50fe3768986d73e957986d12a9aa4 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Fri, 14 Dec 2018 10:35:30 -0500
Subject: [PATCH 1/2] build-stx-base.sh --latest --clean fails to clean the
 latest image

When both --latest and --clean flags are passed to build-stx-base.sh
we expect the docker image tagged as '...-latest' to be deleted
from the local build environment.

This did not occure ...

starlingx/stx-centos      dev-latest          279c713e0b5d        7
hours ago         331MB
starlingx/stx-centos      <none>              dda342637517        19
hours ago        331MB

Adding a code block to handle the case when these flags are combined.

Closes-Bug: 1808544
Change-Id: Ic2d17bc285f3746965c2a5e7ec49c278f0fbf066
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 build-tools/build-docker-images/build-stx-base.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build-tools/build-docker-images/build-stx-base.sh b/build-tools/build-docker-images/build-stx-base.sh
index 6ba1cb1b..67ad57cc 100755
--- a/build-tools/build-docker-images/build-stx-base.sh
+++ b/build-tools/build-docker-images/build-stx-base.sh
@@ -249,6 +249,15 @@ if [ "${CLEAN}" = "yes" ]; then
         exit 1
     fi
 
+    if [ "$TAG_LATEST" = "yes" ]; then
+        echo "Deleting image: ${IMAGE_NAME_LATEST}"
+        docker image rm ${IMAGE_NAME_LATEST}
+        if [ $? -ne 0 ]; then
+            echo "Failed running docker image rm command" >&2
+            exit 1
+        fi
+    fi
+
     if [ ${BASE_IMAGE_PRESENT} -ne 0 ]; then
         # The base image was not already present, so delete it
         echo "Removing docker image ${OS}:${OS_VERSION}"

From 9106b90dbae90d62133d91f1de7a13b2e89c98d4 Mon Sep 17 00:00:00 2001
From: lihaijing <lihaijing@fiberhome.com>
Date: Mon, 24 Dec 2018 02:53:23 -0500
Subject: [PATCH 2/2] Change single quota mark to double quota

In order to get correct "$PLATFORM_RELEASE" value

Change-Id: I842411baf7c2b9bb862fceb920919334e40194aa
Closes-Bug: #1809637
Signed-off-by: lihaijing <lihaijing@fiberhome.com>
---
 build-tools/build-rpms-serial | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/build-rpms-serial b/build-tools/build-rpms-serial
index 9c218667..14cac460 100755
--- a/build-tools/build-rpms-serial
+++ b/build-tools/build-rpms-serial
@@ -2013,7 +2013,7 @@ echo "CMD_OPTIONS=$CMD_OPTIONS"
 
 CMD="$CMD_PREFIX mockchain -r $BUILD_CFG -l $BUILD_BASE --recurse --log=$MOCKCHAIN_LOG --tmp_prefix=$USER --addrepo=$LOCAL_URL --addrepo=$LOCAL_SRC_URL -m --rootdir=$BUILD_BASE/mock/root $CMD_OPTIONS -m --rebuild $SRPMS_LIST"
 echo "$CMD -m --define='_tis_dist .tis' -m --define='platform_release $PLATFORM_RELEASE'" 
-trapwrap stdbuf -o0 $CMD -m --define='_tis_dist .tis' -m --define='platform_release $PLATFORM_RELEASE'
+trapwrap stdbuf -o0 $CMD -m --define='_tis_dist .tis' -m --define="platform_release $PLATFORM_RELEASE"
 MOCKCHAIN_RC=$?
 
 echo $PLATFORM_RELEASE > $LAST_PLATFORM_RELEASE_FILE