Skip to contentSkip to conversation

Revert "classes/archiver: fix tarball content in "original" mode"

PATCH New Jaipaul Cheernam 1 participant 1 message Oct 22

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "classes/archiver: fix tarball content in "original" mode"

This reverts commit c73dbd0fa8a3becf9b90075a418325dc199e8a10.

Reason: Change is not handle original sources unpacked outside ${BP} example with git subpath

Reproduced with sdbus-c++-tools from meta-oe:

INHERIT += "archiver"
ARCHIVER_MODE[src] = "original"

bitbake-layers add-layer <path>/meta-openembedded/meta-oe bitbake sdbus-c++-tools -c do_ar_original -f

---
 meta/classes/archiver.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/archiver.bbclass +1 -1
index c824718a1d..b274c53e79 100644
@@ -230,7 +230,7 @@ python do_ar_original() {
                     else:
                         bb.fatal("Cannot determine archive names for original source because 'name=' URL parameter '%s' is used twice. Make it unique in: %s %s" % (tarball_suffix[name], url))
             tarball_suffix[name] = url
-            create_tarball(d, os.path.join(tmpdir, d.getVar('BP'), '.'), name, ar_outdir)
+            create_tarball(d, tmpdir + '/.', name, ar_outdir)
 
     # Emit patch series files for 'original'
     bb.note('Writing patch series files...')