On Tue, Sep 26, 2023 at 6:43 PM Paolo Bonzini <pbonz...@redhat.com> wrote:
>
> A new enough libfdt is included in all of Debian 11, Ubuntu 20.04
> and MSYS2. It has also been included for several minor releases
> in Fedora and openSUSE Leap, as well as in CentOS. Therefore
> there is no need anymore to ship the sources together with the QEMU
> tarballs.
>
> Keep the wrap file so that it can be used with --enable-download,
> but do not ship the sources anymore with either archive-source.sh
> or make-release.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> meson.build | 3 +++
> scripts/archive-source.sh | 2 +-
> scripts/make-release | 2 +-
> 3 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 5139db2ff7c..81430ce2348 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -3070,6 +3070,9 @@ if fdt_required.length() > 0 or fdt_opt == 'enabled'
> endif
>
> if fdt_opt in ['enabled', 'auto', 'system']
> + if get_option('wrap_mode') == 'nodownload'
> + fdt_opt = 'system'
> + endif
> fdt = cc.find_library('fdt', required: fdt_opt == 'system')
> if fdt.found() and cc.links('''
> #include <libfdt.h>
> diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
> index 48996304910..65af8063e4b 100755
> --- a/scripts/archive-source.sh
> +++ b/scripts/archive-source.sh
> @@ -26,7 +26,7 @@ sub_file="${sub_tdir}/submodule.tar"
> # independent of what the developer currently has initialized
> # in their checkout, because the build environment is completely
> # different to the host OS.
> -subprojects="dtc keycodemapdb libvfio-user berkeley-softfloat-3
> berkeley-testfloat-3"
> +subprojects="keycodemapdb libvfio-user berkeley-softfloat-3
> berkeley-testfloat-3"
> sub_deinit=""
>
> function cleanup() {
> diff --git a/scripts/make-release b/scripts/make-release
> index c5db87b3f91..9c570b87f4a 100755
> --- a/scripts/make-release
> +++ b/scripts/make-release
> @@ -17,7 +17,7 @@ if [ $# -ne 2 ]; then
> fi
>
> # Only include wraps that are invoked with subproject()
> -SUBPROJECTS="dtc libvfio-user keycodemapdb berkeley-softfloat-3
> berkeley-testfloat-3"
> +SUBPROJECTS="libvfio-user keycodemapdb berkeley-softfloat-3
> berkeley-testfloat-3"
>
> src="$1"
> version="$2"
> --
> 2.41.0
>
>
--
Marc-André Lureau
