From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E25E9C4338F for ; Wed, 25 Aug 2021 12:44:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7E59861181 for ; Wed, 25 Aug 2021 12:44:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7E59861181 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:47492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIsGa-0001wB-Ak for qemu-devel@archiver.kernel.org; Wed, 25 Aug 2021 08:44:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIsFa-00019I-Ld for qemu-devel@nongnu.org; Wed, 25 Aug 2021 08:43:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIsFY-0002or-0C for qemu-devel@nongnu.org; Wed, 25 Aug 2021 08:43:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629895402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sViBkUPSB+944MDSnKteNuRpKIQV8H5ouW4O81vBwcg=; b=eaxNBTJbkFSgoMTEKC0nR1OWhrq6GVttor2ikzzTE4rDd2hoIggOYSGQfc2lBpYJ9FmiUg pU/bFharkJHVc2fD+uow0zHIZtGRslOoqOClssx/FrcrZlYmYDIw/bsak1M9848/xpwddK 1lH1t9RMwn/zgHTsV03CsiGifuYjnWE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-M0mZtvbPNhOvBfYTP7yGzA-1; Wed, 25 Aug 2021 08:43:19 -0400 X-MC-Unique: M0mZtvbPNhOvBfYTP7yGzA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CDCD8100806A; Wed, 25 Aug 2021 12:43:18 +0000 (UTC) Received: from localhost (unknown [10.39.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4BC076A8FA; Wed, 25 Aug 2021 12:43:12 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH] RFC: build-sys: drop dtc submodule Date: Wed, 25 Aug 2021 16:43:09 +0400 Message-Id: <20210825124309.223622-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.745, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau DTC is widely available, we could consider to stop bundling it. curl -s 'https://repology.org/api/v1/project/dtc' | \ jq -r 'group_by(.repo) | .[] | "\(.[0].repo): \(map(.version))"' | \ egrep -i 'ubuntu_18|debian_old|rhel|centos|bsd|suse_leap_15_2|sles|homebrew|pkgsrc' centos_8: ["1.6.0","1.6.0"] debian_oldstable: ["1.4.7"] freebsd: ["1.6.0"] homebrew: ["1.6.1"] openbsd: ["1.6.0"] opensuse_leap_15_2: ["1.5.1","1.5.1"] pkgsrc_current: ["1.4.7"] ubuntu_18_04: ["1.4.5"] MinGW package on Fedora pending review. (https://bugzilla.redhat.com/show_bug.cgi?id=1997511) Debian is lacking the MinGW package. Signed-off-by: Marc-André Lureau --- configure | 22 +------------------- meson.build | 53 ++++++++--------------------------------------- .gitmodules | 3 --- dtc | 1 - meson_options.txt | 3 --- 5 files changed, 10 insertions(+), 72 deletions(-) delete mode 160000 dtc diff --git a/configure b/configure index 9a79a004d7..04050c0426 100755 --- a/configure +++ b/configure @@ -296,7 +296,6 @@ curl="auto" iconv="auto" curses="auto" docs="auto" -fdt="auto" netmap="no" sdl="auto" sdl_image="auto" @@ -1212,14 +1211,6 @@ for opt do ;; --enable-curl) curl="enabled" ;; - --disable-fdt) fdt="disabled" - ;; - --enable-fdt) fdt="enabled" - ;; - --enable-fdt=git) fdt="internal" - ;; - --enable-fdt=system) fdt="system" - ;; --disable-linux-aio) linux_aio="no" ;; --enable-linux-aio) linux_aio="yes" @@ -1890,7 +1881,6 @@ disabled with --disable-FEATURE, default is enabled if available brlapi BrlAPI (Braile) curl curl connectivity membarrier membarrier system call (for Linux 4.14+ or Windows) - fdt fdt device tree kvm KVM acceleration support hax HAX acceleration support hvf Hypervisor.framework acceleration support @@ -3439,16 +3429,6 @@ if compile_prog "" "" ; then iovec=yes fi -########################################## -# fdt probe - -case "$fdt" in - auto | enabled | internal) - # Simpler to always update submodule, even if not needed. - git_submodules="${git_submodules} dtc" - ;; -esac - ########################################## # opengl probe (for sdl2, gtk) @@ -5199,7 +5179,7 @@ if test "$skip_meson" = no; then -Dlibusb=$libusb -Dsmartcard=$smartcard -Dusb_redir=$usb_redir -Dvte=$vte \ -Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \ -Dgettext=$gettext -Dxkbcommon=$xkbcommon -Du2f=$u2f -Dvirtiofsd=$virtiofsd \ - -Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt -Dbrlapi=$brlapi \ + -Dcapstone=$capstone -Dslirp=$slirp -Dbrlapi=$brlapi \ -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \ -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse -Dlibxml2=$libxml2 \ diff --git a/meson.build b/meson.build index b3e7ec0e92..1b30dd7bdc 100644 --- a/meson.build +++ b/meson.build @@ -1897,50 +1897,15 @@ if get_option('cfi') and slirp_opt == 'system' endif fdt = not_found -fdt_opt = get_option('fdt') -if have_system - if fdt_opt in ['enabled', 'auto', 'system'] - have_internal = fs.exists(meson.current_source_dir() / 'dtc/libfdt/Makefile.libfdt') - fdt = cc.find_library('fdt', kwargs: static_kwargs, - required: fdt_opt == 'system' or - fdt_opt == 'enabled' and not have_internal) - if fdt.found() and cc.links(''' - #include - #include - int main(void) { fdt_check_full(NULL, 0); return 0; }''', - dependencies: fdt) - fdt_opt = 'system' - elif have_internal - fdt_opt = 'internal' - else - fdt_opt = 'disabled' +if fdt_required.length() > 0 + fdt = cc.find_library('fdt', kwargs: static_kwargs) + if not fdt.found() or not cc.links(''' +#include +#include +int main(void) { fdt_first_subnode(NULL, 0); return 0; }''', + dependencies: fdt) + error('fdt >= 1.4.2 required by targets ' + ', '.join(fdt_required)) endif - endif - if fdt_opt == 'internal' - fdt_files = files( - 'dtc/libfdt/fdt.c', - 'dtc/libfdt/fdt_ro.c', - 'dtc/libfdt/fdt_wip.c', - 'dtc/libfdt/fdt_sw.c', - 'dtc/libfdt/fdt_rw.c', - 'dtc/libfdt/fdt_strerror.c', - 'dtc/libfdt/fdt_empty_tree.c', - 'dtc/libfdt/fdt_addresses.c', - 'dtc/libfdt/fdt_overlay.c', - 'dtc/libfdt/fdt_check.c', - ) - - fdt_inc = include_directories('dtc/libfdt') - libfdt = static_library('fdt', - build_by_default: false, - sources: fdt_files, - include_directories: fdt_inc) - fdt = declare_dependency(link_with: libfdt, - include_directories: fdt_inc) - endif -endif -if not fdt.found() and fdt_required.length() > 0 - error('fdt not available but required by targets ' + ', '.join(fdt_required)) endif config_host_data.set('CONFIG_CAPSTONE', capstone.found()) @@ -3069,7 +3034,7 @@ summary_info += {'Linux io_uring support': linux_io_uring.found()} summary_info += {'ATTR/XATTR support': libattr.found()} summary_info += {'RDMA support': config_host.has_key('CONFIG_RDMA')} summary_info += {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA')} -summary_info += {'fdt support': fdt_opt == 'disabled' ? false : fdt_opt} +summary_info += {'fdt support': fdt.found()} summary_info += {'libcap-ng support': libcap_ng.found()} summary_info += {'bpf support': libbpf.found()} # TODO: add back protocol and server version diff --git a/.gitmodules b/.gitmodules index 08b1b48a09..582303698b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,9 +16,6 @@ [submodule "roms/sgabios"] path = roms/sgabios url = https://gitlab.com/qemu-project/sgabios.git -[submodule "dtc"] - path = dtc - url = https://gitlab.com/qemu-project/dtc.git [submodule "roms/u-boot"] path = roms/u-boot url = https://gitlab.com/qemu-project/u-boot.git diff --git a/dtc b/dtc deleted file mode 160000 index 85e5d83984..0000000000 --- a/dtc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647 diff --git a/meson_options.txt b/meson_options.txt index a9a9b8f4c6..8ba5433356 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -152,6 +152,3 @@ option('capstone', type: 'combo', value: 'auto', option('slirp', type: 'combo', value: 'auto', choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], description: 'Whether and how to find the slirp library') -option('fdt', type: 'combo', value: 'auto', - choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], - description: 'Whether and how to find the libfdt library') -- 2.33.0.rc2