Fixing minor issue during code-merge

Signed-off-by: Rodny Molina <rmolina@linkedin.com>
sonic-net · Jul 27, 2018 · 58cf9aa · 58cf9aa
1 parent 8fd7a26
commit 58cf9aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/rules/bash.mk b/rules/bash.mk
@@ -6,11 +6,11 @@
 # completed.
 
 # Bash major release-number corresponding to Debian-8 (Jessie)
-BASH_VERSION = 4.3
-# Bash complete release-number. This image contains all 4.3 fixes  up to path '42'.
-BASH_VERSION_FULL = $(BASH_VERSION)-14
+BASH_VERSION_MAJOR = 4.3
+# Bash complete release-number. This image contains all 4.3 fixes  up to patch '42'.
+BASH_VERSION_FULL = $(BASH_VERSION_MAJOR)-14
 
-export BASH_VERSION BASH_VERSION_FULL
+export BASH_VERSION_MAJOR BASH_VERSION_FULL
 
 BASH = bash_$(BASH_VERSION_FULL)_amd64.deb
 $(BASH)_SRC_PATH = $(SRC_PATH)/bash

diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile
@@ -226,7 +226,7 @@ RUN apt-get update && apt-get install -y \
         python3-docutils \
         python3-requests \
         python3-pytest \
-        python3-colorama
+        python3-colorama \
 # For bash
         texi2html
 

diff --git a/src/bash/Makefile b/src/bash/Makefile
@@ -5,11 +5,11 @@ SHELL = /bin/bash
 MAIN_TARGET = bash_$(BASH_VERSION_FULL)_amd64.deb
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	rm -rf bash-$(BASH_VERSION)
+	rm -rf bash-$(BASH_VERSION_MAJOR)
 
 	dget -u https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/$(BASH_VERSION_FULL)/bash_$(BASH_VERSION_FULL).dsc
 
-	pushd bash-$(BASH_VERSION)
+	pushd bash-$(BASH_VERSION_MAJOR)
 	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
 	popd