Patchwork [02/18] Add negative instruction for packaging using (!)

login
register
mail settings
Submitter Yann Diorcet
Date Oct. 21, 2012, 3:27 p.m.
Message ID <1350833261-8401-2-git-send-email-diorcet.yann@gmail.com>
Download mbox | patch
Permalink /patch/193009/
State Under Review
Delegated to: Esben Haabendal
Headers show

Comments

Yann Diorcet - Oct. 21, 2012, 3:27 p.m.
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>

It is usefull to use a negative instruction in order to remove few files from previously selected file list due to a joker
Ex: 
/lib/*
!/lib/not_this_file
---
 classes/package.oeclass |   32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

Patch

diff --git a/classes/package.oeclass b/classes/package.oeclass
index c3c89e3..c6bfc20 100644
--- a/classes/package.oeclass
+++ b/classes/package.oeclass
@@ -38,9 +38,14 @@  def do_split(d):
     for pkg in package_list:
         root = os.path.join(pkgd, pkg)
         bb.utils.mkdirhier(root)
-
         files = (d.get("FILES_" + pkg) or "").split()
-        for file in files:
+        resolved_files = []
+        removed_files = []
+        while len(files):
+            file = files.pop(0)
+            remove = file.startswith("!")
+            if remove:
+                file = file[1:]
             if os.path.isabs(file):
                 file = "." + file
             if not os.path.islink(file):
@@ -53,15 +58,32 @@  def do_split(d):
             if globbed:
                 if [ file ] != globbed:
                     if not file in globbed:
-                        files += globbed
+                        if remove:
+                            files += ["!"+ x for x in globbed]
+                        else:
+                            files += globbed
                         continue
                     else:
                         globbed.remove(file)
-                        files += globbed
+                        if remove:
+                            files += ["!"+ x for x in globbed]
+                        else:
+                            files += globbed
+                        continue            
+
             if (not os.path.islink(file)) and (not os.path.exists(file)):
                 continue
-            if file in seen:
+            if remove:
+                removed_files.append(file)
                 continue
+            if not file in seen:
+            	resolved_files.append(file)
+
+        for file in removed_files:
+            if file in resolved_files:
+                resolved_files.remove(file) 
+        
+        for file in resolved_files:
             seen.append(file)
             if os.path.isdir(file) and not os.path.islink(file):
                 bb.utils.mkdirhier(os.path.join(root,file))