From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
To: openembedded-core@lists.openembedded.org
Date: Fri, 12 Jul 2019 12:13:16 +0200
Message-Id: <20190712101316.6887-1-pkj@axis.com>
MIME-Version: 1.0
Subject: [PATCH] glibc-package.inc: Do not use bitbake variable syntax for shell variables
Precedence: list
Content-Transfer-Encoding: 8bit

Using bitbake variable syntax (i.e., ${FOO}) for shell variables is
bad practice. First of all it is confusing, but more importantly it
can lead to weird problems if someone actually defines a bitbake
variable with the same name as the shell variable.

Also correct the indentation in stash_locale_cleanup().

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 meta/recipes-core/glibc/glibc-package.inc | 48 +++++++++++------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 5cfb1b6ab9..b150a34378 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -161,34 +161,34 @@ bashscripts = "mtrace sotruss xtrace"
 
 do_stash_locale () {
 	dest=${LOCALESTASH}
-	install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir}
+	install -d $dest${base_libdir} $dest${bindir} $dest${libdir} $dest${datadir}
 	# Hide away the locale data from the deployment
 	if [ -e ${D}${bindir}/localedef ]; then
-		cp -a ${D}${bindir}/localedef ${dest}${bindir}
+		cp -a ${D}${bindir}/localedef $dest${bindir}
 	fi
 	if [ -e ${D}${libdir}/gconv ]; then
-		cp -a ${D}${libdir}/gconv ${dest}${libdir}
+		cp -a ${D}${libdir}/gconv $dest${libdir}
 	fi
 	if [ -e ${D}${datadir}/i18n ]; then
-		cp -a  ${D}${datadir}/i18n ${dest}${datadir}
+		cp -a  ${D}${datadir}/i18n $dest${datadir}
 	fi
 
 	# Make a copy of all the libraries into the locale stash
-	cp -fpPR ${D}${libdir}/* ${dest}${libdir}
+	cp -fpPR ${D}${libdir}/* $dest${libdir}
 	if [ "${base_libdir}" != "${libdir}" ]; then
-		cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
+		cp -fpPR ${D}${base_libdir}/* $dest${base_libdir}
 	fi
 	if [ -e ${D}${exec_prefix}/lib ]; then
 		if [ ${exec_prefix}/lib != ${base_libdir} ] && [ ${exec_prefix}/lib != ${libdir} ]; then
-			cp -fpPR ${D}${exec_prefix}/lib ${dest}${exec_prefix}
+			cp -fpPR ${D}${exec_prefix}/lib $dest${exec_prefix}
 		fi
 	fi
 
-	cp -fpPR ${D}${datadir}/* ${dest}${datadir}
+	cp -fpPR ${D}${datadir}/* $dest${datadir}
 	rm -rf ${D}${datadir}/locale/
-	cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
+	cp -fpPR ${WORKDIR}/SUPPORTED $dest
 
-	target=${dest}/scripts
+	target=$dest/scripts
 	mkdir -p $target
 	for i in ${bashscripts}; do
 		if [ -f ${D}${bindir}/$i ]; then
@@ -216,23 +216,23 @@ stash_locale_cleanup () {
 	cleanupdir=$1
 	# Remove all files which do_stash_locale() copies
 	for i in ${bashscripts}; do
-	    rm -f ${cleanupdir}${bindir}/$i
+		rm -f $cleanupdir${bindir}/$i
 	done
-	rm -f ${cleanupdir}${bindir}/localedef
-	rm -rf ${cleanupdir}${datadir}/i18n
-	rm -rf ${cleanupdir}${libdir}/gconv
-	rm -rf ${cleanupdir}/${localedir}
-	rm -rf ${cleanupdir}${datadir}/locale
+	rm -f $cleanupdir${bindir}/localedef
+	rm -rf $cleanupdir${datadir}/i18n
+	rm -rf $cleanupdir${libdir}/gconv
+	rm -rf $cleanupdir${localedir}
+	rm -rf $cleanupdir${datadir}/locale
 	if [ "${libdir}" != "${exec_prefix}/lib" ] && [ "${root_prefix}/lib" != "${exec_prefix}/lib" ]; then
-	    if [ -d "${cleanupdir}${exec_prefix}/lib" ]; then
-		if [ -z "${ARCH_DYNAMIC_LOADER}" -o \
-		     ! -e "${cleanupdir}${exec_prefix}/lib/${ARCH_DYNAMIC_LOADER}" ]; then
-			# error out if directory isn't empty
-			# this dir should only contain locale dir
-			# which has been deleted in the previous step
-			rmdir ${cleanupdir}${exec_prefix}/lib
+		if [ -d "$cleanupdir${exec_prefix}/lib" ]; then
+			if [ -z "${ARCH_DYNAMIC_LOADER}" -o \
+			     ! -e "$cleanupdir${exec_prefix}/lib/${ARCH_DYNAMIC_LOADER}" ]; then
+				# error out if directory isn't empty
+				# this dir should only contain locale dir
+				# which has been deleted in the previous step
+				rmdir $cleanupdir${exec_prefix}/lib
+			fi
 		fi
-	    fi
 	fi
 }
 
-- 
2.21.0