e2build: do not include the '.' directory in result.tar

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/local/e2build.lua b/local/e2build.lua
index b8e98c9b2c77bf79c5547ba2c58f65c7ac8f28e1..4eca5b33bc5b5460aaa6cbc2ef71f8934bd295ac 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -918,13 +918,20 @@ function e2build.build_process_class:_store_result(res, return_flags)
         return false, e:cat(re)
     end
 
-    -- XXX: don't pack ., but individual components
-    rc, re = e2lib.tar({
-        "-cf",  e2lib.join(tmpdir, "result.tar"),
-        "-C", resdir, "." })
+    -- do not include the "." directory in result.tar
+    local argv = { "-cf",  e2lib.join(tmpdir, "result.tar"), "-C", resdir, "--" }
+
+    for entry, re in e2lib.directory(resdir, true) do
+        if not entry then
+            return false, e:cat(re)
+        end
+        table.insert(argv, entry)
+    end
+    rc, re = e2lib.tar(argv)
     if not rc then
         return false, e:cat(re)
     end
+
     local server, location = res:build_mode().storage(info.project_location,
         project.release_id())
 
@@ -956,7 +963,7 @@ end
 function e2build.build_process_class:_linklast(res, return_flags)
     local rc, re, e
     local info, server, location, buildid, dst, lnk
-    
+
     e = err.new("creating link to last results")
     info = e2tool.info()
     -- calculate the path to the result