Re: [PATCH v2] classes/archiver: fix tarball content in "original" mode

[Joao Marcos Costa <joaomarcos.costa@bootlin.com>]

Hello, folks

On 9/9/26 7:03 PM, João Marcos Costa wrote:
> When ARCHIVER_MODE[src] is set to "original", a tarball is generated with
> the unpacked sources of a given recipe. Prior to it, a tmpdir
> (i.e. from tempfile.mkdtemp()) is created and the sources are unpacked inside:
> 
> (...)/vim/9.2.0340/archiver-work/tmp8pu2nsck
> `-- vim-9.2.0340
>      |-- READMEdir
>      |-- ci
>      |-- lang
> 
> This tmpdir, however, ends up being shipped in the deployed tarball:
> 
> $ tar -tf vim-9.2.0340-r0.tar.xz
> (...)
> tmp8pu2nsck/vim-9.2.0340/ci/config.mk.clang-12.sed
> tmp8pu2nsck/vim-9.2.0340/LICENSE
> tmp8pu2nsck/vim-9.2.0340/.git-blame-ignore-revs
> (...)
> 
> This can be avoided by pointing to the subdir where the sources are
> unpacked, rather than to tmpdir, when calling create_tarball().
> 
> The subdir's name can be inferred from 'BP', so we will use
> 'tmp8pu2nsck/vim-9.2.0340/.' instead of 'tmp8pu2nsck/.' as input.
> 
> e.g. and in the result:
> 
> ./
> ./vim-9.2.0304/
> ./vim-9.2.0304/SECURITY.md
> ./vim-9.2.0304/.codecov.yml
> (...)
> 
> Signed-off-by: João Marcos Costa <joaomarcos.costa@bootlin.com>
> ---
>   meta/classes/archiver.bbclass | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
> index b274c53e79..c824718a1d 100644
> --- a/meta/classes/archiver.bbclass
> +++ b/meta/classes/archiver.bbclass
> @@ -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, tmpdir + '/.', name, ar_outdir)
> +            create_tarball(d, os.path.join(tmpdir, d.getVar('BP'), '.'), name, ar_outdir)
>   
>       # Emit patch series files for 'original'
>       bb.note('Writing patch series files...')

Gentle ping: would there by any updates on this one?
Thanks!

-- 
Best regards,
João Marcos Costa