On Fri, Feb 14, 2025 at 12:17 AM Michael Tokarev <m...@tls.msk.ru> wrote:
>
> 14.02.2025 02:53, Michael Roth пишет:
> > The current logic scans qemu.git/subprojects/ from *.wrap files to
> > determine whether or not to include the associated directories in the
> > release tarballs. However, the script assumes that it is being run from
> > the top-level of the source directory, which may not always be the case.
> > In particular, when generating releases via, e.g.:
> >
> > make qemu-9.2.1.tar.xz
> >
> > the $CWD will either be an arbitrary external build directory, or
> > qemu.git/build, and the exclusions will not be processed as expected.
> > Fix this by using the $src parameter passed to the script as the root
> > directory for the various subproject/ paths referenced by this logic.
> >
> > Also, the error case at the beginning of the subproject_dir() will not
> > result in the error message being printed, and will instead produce an
> > error message about "error" not being a valid command. Fix this by using
> > basic shell commands.
> >
> > Fixes: be27b5149c86 ("make-release: only leave tarball of wrap-file
> > subprojects")
> > Cc: Paolo Bonzini <pbonz...@redhat.com>
> > Cc: Michael Tokarev <m...@tls.msk.ru>
> > Cc: qemu-sta...@nongnu.org
> > Signed-off-by: Michael Roth <michael.r...@amd.com>
>
> Reviewed-by: Michael Tokarev <m...@tls.msk.ru>
> Tested-by: Michael Tokarev <m...@tls.msk.ru>
>
> It would be best if this change is applied to master as a quick fix
> (it does not affect anything in master at all, including CI), so we
> can resolve an issue on download.qemu.org (wrong 9.2.1 tarballs).
Thanks for including this patch in your pull request. It's running
through CI right now.
Stefan
