From: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Date: Wed, 3 Feb 2010 20:08:45 +0000 (+0100)
Subject: packaged-staging.bbclass: removed two superfluous slashes
X-Git-Tag: Release-2010-05/1~595
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49031ff03256cb8ac350676f4c9c66288abdbd2a;p=openembedded.git

packaged-staging.bbclass: removed two superfluous slashes

${SYSROOT_DESTDIR} ends on a / but there is also a / after the variable
and a slash as the first character of the next variable.
This patch removes the / that is explicitly added so in the generated
code we get // instead of the even sillier looking (and probably more
confusing) ///

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 108cfb096b..1ede25cef0 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -288,8 +288,8 @@ packagedstaging_fastpath () {
 	if [ "$PSTAGING_ACTIVE" = "1" ]; then
 		mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
 		mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/
-		cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true
-		cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true
+		cp -fpPR ${SYSROOT_DESTDIR}${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true
+		cp -fpPR ${SYSROOT_DESTDIR}${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true
 	fi
 }