From a9ecfad820594837aa3a0610b7d718c5dd8904dd Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Mon, 15 Mar 2010 08:05:41 +0100
Subject: src_distribute_local: fix quoting

Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
 classes/src_distribute_local.bbclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'classes/src_distribute_local.bbclass')

diff --git a/classes/src_distribute_local.bbclass b/classes/src_distribute_local.bbclass
index 5cec2880aa..8cf0b426c0 100644
--- a/classes/src_distribute_local.bbclass
+++ b/classes/src_distribute_local.bbclass
@@ -6,24 +6,24 @@ SRC_DISTRIBUTECOMMAND[dirs] = "${SRC_DISTRIBUTEDIR}/${LIC}/${PN}"
 
 # symlinks the files to the SRC_DISTRIBUTEDIR
 SRC_DISTRIBUTECOMMAND-symlink () {
-    test -e ${SRC}.md5 && ln -sf ${SRC}.md5 .
-    ln -sf ${SRC} .
+    test -e "${SRC}.md5" && ln -sf "${SRC}.md5" .
+    ln -sf "${SRC}" .
 }
 
 # copies the files to the SRC_DISTRIBUTEDIR
 SRC_DISTRIBUTECOMMAND-copy () {
-    test -e ${SRC}.md5 && cp -f ${SRC}.md5 .
-    cp -fr ${SRC} .
+    test -e "${SRC}.md5" && cp -f "${SRC}.md5" .
+    cp -fr "${SRC}" .
 }
 
 # moves the files to the SRC_DISTRIBUTEDIR and symlinks them back
 SRC_DISTRIBUTECOMMAND-move+symlink () {
     if ! [ -L ${SRC} ]; then
         mv ${SRC} .
-        ln -sf $PWD/`basename ${SRC}` ${SRC}
+        ln -sf $PWD/`basename "${SRC}"` "${SRC}"
         if [ -e ${SRC}.md5 ]; then
             mv ${SRC}.md5 .
-            ln -sf $PWD/`basename ${SRC}.md5` ${SRC}.md5
+            ln -sf $PWD/`basename "${SRC}.md5"` "${SRC}.md5"
         fi
     fi
 }
-- 
cgit v1.2.3


From d91b6bc42319db7799cf9188f7150f807ed41163 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Sun, 21 Mar 2010 18:31:25 -0700
Subject: src_distribute: simplify do_distribute_sources

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
 classes/src_distribute_local.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'classes/src_distribute_local.bbclass')

diff --git a/classes/src_distribute_local.bbclass b/classes/src_distribute_local.bbclass
index 8cf0b426c0..7b1e7d7e48 100644
--- a/classes/src_distribute_local.bbclass
+++ b/classes/src_distribute_local.bbclass
@@ -19,11 +19,12 @@ SRC_DISTRIBUTECOMMAND-copy () {
 # moves the files to the SRC_DISTRIBUTEDIR and symlinks them back
 SRC_DISTRIBUTECOMMAND-move+symlink () {
     if ! [ -L ${SRC} ]; then
+        src=`basename "${SRC}"`
         mv ${SRC} .
-        ln -sf $PWD/`basename "${SRC}"` "${SRC}"
+        ln -sf $src "${SRC}"
         if [ -e ${SRC}.md5 ]; then
             mv ${SRC}.md5 .
-            ln -sf $PWD/`basename "${SRC}.md5"` "${SRC}.md5"
+            ln -sf $src "${SRC}.md5"
         fi
     fi
 }
-- 
cgit v1.2.3