Browse Source

make-release: do not ship dtc sources

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 <pbonzini@redhat.com>
Paolo Bonzini 1 year ago
parent
commit
f0df613b98
3 changed files with 5 additions and 2 deletions
  1. 3 0
      meson.build
  2. 1 1
      scripts/archive-source.sh
  3. 1 1
      scripts/make-release

+ 3 - 0
meson.build

@@ -3070,6 +3070,9 @@ if fdt_required.length() > 0 or fdt_opt == 'enabled'
   endif
   endif
 
 
   if fdt_opt in ['enabled', 'auto', 'system']
   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')
     fdt = cc.find_library('fdt', required: fdt_opt == 'system')
     if fdt.found() and cc.links('''
     if fdt.found() and cc.links('''
        #include <libfdt.h>
        #include <libfdt.h>

+ 1 - 1
scripts/archive-source.sh

@@ -26,7 +26,7 @@ sub_file="${sub_tdir}/submodule.tar"
 # independent of what the developer currently has initialized
 # independent of what the developer currently has initialized
 # in their checkout, because the build environment is completely
 # in their checkout, because the build environment is completely
 # different to the host OS.
 # 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=""
 sub_deinit=""
 
 
 function cleanup() {
 function cleanup() {

+ 1 - 1
scripts/make-release

@@ -17,7 +17,7 @@ if [ $# -ne 2 ]; then
 fi
 fi
 
 
 # Only include wraps that are invoked with subproject()
 # 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"
 src="$1"
 version="$2"
 version="$2"