From: Joshua Lock <josh@linux.intel.com>
Date: Mon, 12 Apr 2010 14:56:45 +0000 (+0100)
Subject: relocatable.bbclass: Actually skip symlinks
X-Git-Tag: 2011-1~6030
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d3fbb56c2ffa44e2da15ca4bfa4def35792ab6f7;p=openembedded-core.git

relocatable.bbclass: Actually skip symlinks

The previous patch to do so was badly merged and didn't actually skip all
symlinks, only ones which where not an absolute path...

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---

diff --git a/meta/classes/relocatable.bbclass b/meta/classes/relocatable.bbclass
index 6954f2d967..36545530c7 100644
--- a/meta/classes/relocatable.bbclass
+++ b/meta/classes/relocatable.bbclass
@@ -19,10 +19,8 @@ def process_dir (directory, d):
     for file in dirs:
         fpath = directory + "/" + file
         if os.path.islink(fpath):
-            fpath = os.readlink(fpath)
-            if not os.path.isabs(fpath):
-                # Skip symlinks
-                continue
+            # Skip symlinks
+            continue
 
         if os.path.isdir(fpath):
             process_dir(fpath, d)