Date: Sat, 12 Sep 2020 22:25:06 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548428 - in head/emulators/qemu-devel: . files Message-ID: <202009122225.08CMP6EQ094389@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Sat Sep 12 22:25:06 2020 New Revision: 548428 URL: https://svnweb.freebsd.org/changeset/ports/548428 Log: emulators/qemu-devel: Update version 4.2.0=>5.1.0.20200909 - Move to SNAPSHOT versions of qemu - Remove i386 support temporarily as build is failing on i386 - Change MASTER_SITES to GITHUB - Mark IGNORE for 11.X as it cannot build Position Independent Code on 11 - OPTIONIZE NCURSES for support of both base and ports [1] - Add OPTIONS CAPSTONE and use CAPSTONE from ports - Remove PCAP related patches as was unable to create PANIC while using TSO - Fixes for the RISC-V PLIC that are required to boot FreeBSD/riscv64 HEAD after r362977 PR: 245997 [1] Submitted by: lab+bsd@thinkum.space [1] Reported by: lwhsu jhb Added: head/emulators/qemu-devel/files/patch-docs_system_qemu-cpu-models.rst (contents, props changed) Deleted: head/emulators/qemu-devel/files/patch-Makefile head/emulators/qemu-devel/files/patch-include_net_net.h head/emulators/qemu-devel/files/patch-include_qemu_atomic.h head/emulators/qemu-devel/files/patch-qemu-doc.texi head/emulators/qemu-devel/files/pcap-patch-net_clients.h head/emulators/qemu-devel/files/pcap-patch-net_net.c head/emulators/qemu-devel/files/pcap-patch-qapi_net.json Modified: head/emulators/qemu-devel/Makefile head/emulators/qemu-devel/distinfo head/emulators/qemu-devel/files/patch-configure head/emulators/qemu-devel/pkg-plist Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Sat Sep 12 22:17:52 2020 (r548427) +++ head/emulators/qemu-devel/Makefile Sat Sep 12 22:25:06 2020 (r548428) @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 4.2.0 -PORTREVISION= 1 +DISTVERSION= 5.1.0.20200909 CATEGORIES= emulators -MASTER_SITES= https://download.qemu.org/ PKGNAMESUFFIX= -devel DIST_SUBDIR= qemu/${PORTVERSION} @@ -14,7 +12,8 @@ COMMENT= QEMU CPU Emulator - development version LICENSE= GPLv2 -ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 +ONLY_FOR_ARCHS= amd64 powerpc powerpc64 +IGNORE_FreeBSD_11= Unable to produce Position Independent Code LIB_DEPENDS= libnettle.so:security/nettle \ libfontconfig.so:x11-fonts/fontconfig \ @@ -24,75 +23,89 @@ LIB_DEPENDS= libnettle.so:security/nettle \ USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t perl5 \ pkgconfig python:build tar:xz xorg +USE_GITHUB= yes USE_GNOME= cairo glib20 libxml2 USE_PERL5= build USE_XORG= pixman +GH_TUPLE= qemu:qemu:9435a8b \ + qemu:keycodemapdb:6b3d716:keycodemapdb/ui/keycodemapdb \ + qemu:dtc:85e5d83:dtc/dtc \ + mesonbuild:meson:68ed748:meson/meson \ + cota:berkeley-softfloat-3:b64af41:berkeleysoftfloat3/tests/fp/berkeley-softfloat-3 \ + cota:berkeley-testfloat-3:5a59dce:berkeleytestfloat3/tests/fp/berkeley-testfloat-3 #BROKEN_powerpc64= fails to compile: In function aio_bh_poll: internal compiler error: Segmentation fault #.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent") #.endif HAS_CONFIGURE= yes -MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 -OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \ - VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \ - STATIC_LINK DOCS NCURSES -SAMBA_DESC= samba dependency (for -smb) +OPTIONS_SINGLE= NCURSES +OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT +OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL VDE \ + CDROM_DMA USBREDIR X86_TARGETS STATIC_LINK DOCS CAPSTONE +OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL NCURSES_DEFAULT VDE \ + CAPSTONE +OPTIONS_SUB= yes +CAPSTONE_DESC= Disassembly framework support +CDROM_DMA_DESC= IDE CDROM DMA GNUTLS_DESC= gnutls dependency (vnc encryption) -SASL_DESC= cyrus-sasl dependency (vnc encryption) JPEG_DESC= jpeg dependency (vnc lossy compression) +NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base) +NCURSES_BASE_DESC= Depend on ncurses in base +NCURSES_PORT_DESC= Depend on devel/ncurses in ports PNG_DESC= png dependency (vnc compression) -CDROM_DMA_DESC= IDE CDROM DMA -PCAP_DESC= pcap dependency (networking with bpf) -USBREDIR_DESC= usb device network redirection (experimental!) -X86_TARGETS_DESC= Build only x86 system targets +SAMBA_DESC= samba dependency (for -smb) +SASL_DESC= cyrus-sasl dependency (vnc encryption) STATIC_LINK_DESC= Statically link the executables +USBREDIR_DESC= usb device network redirection (experimental!) VDE_DESC= vde dependency (for vde networking) -OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE -OPTIONS_SUB= yes -X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2 -X11_USES= sdl -X11_CONFIGURE_ENABLE= sdl +X86_TARGETS_DESC= Build only x86 system targets +CAPSTONE_CONFIGURE_ON= --enable-capstone=system --extra-cflags=-I${LOCALBASE}/include/capstone +CAPSTONE_CONFIGURE_OFF= --disable-capstone +CAPSTONE_LIB_DEPENDS= libcapstone.so:devel/capstone4 +CURL_CONFIGURE_OFF= --disable-curl +CURL_LIB_DEPENDS= libcurl.so:ftp/curl +DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html \ + sphinx-build:textproc/py-sphinx +DOCS_CONFIGURE_ENABLE= docs +DOCS_USES= makeinfo +GNUTLS_CONFIGURE_OFF= --disable-gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GTK3_CONFIGURE_OFF= --disable-gtk --disable-vte GTK3_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon GTK3_USE= GNOME=gdkpixbuf2,gtk30,vte3 XORG=x11,xext GTK3_USES= gettext gl -GTK3_CONFIGURE_OFF= --disable-gtk --disable-vte -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -GNUTLS_CONFIGURE_OFF= --disable-gnutls -SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASL_CONFIGURE_OFF= --disable-vnc-sasl -JPEG_USES= jpeg JPEG_CONFIGURE_OFF= --disable-vnc-jpeg -PNG_LIB_DEPENDS= libpng.so:graphics/png -PNG_CONFIGURE_OFF= --disable-vnc-png -CURL_LIB_DEPENDS= libcurl.so:ftp/curl -CURL_CONFIGURE_OFF= --disable-curl +JPEG_USES= jpeg +NCURSES_DEFAULT_USES= ncurses +NCURSES_BASE_USES= ncurses:base +NCURSES_PORT_USES= ncurses:port +OPENGL_CONFIGURE_OFF= --disable-opengl OPENGL_USE= GL=gl OPENGL_USES= gl -OPENGL_CONFIGURE_OFF= --disable-opengl -USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir -USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir -USBREDIR_CONFIGURE_OFF= --disable-usb-redir -PCAP_CONFIGURE_ON= --enable-pcap -PCAP_EXTRA_PATCHES= ${FILESDIR}/pcap-patch-qapi_net.json ${FILESDIR}/pcap-patch-net_net.c \ - ${FILESDIR}/pcap-patch-net_clients.h -VDE_LIB_DEPENDS= libvdeplug.so:net/vde2 -VDE_CONFIGURE_OFF= --disable-vde +PNG_CONFIGURE_OFF= --disable-vnc-png +PNG_LIB_DEPENDS= libpng.so:graphics/png +SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd +SASL_CONFIGURE_OFF= --disable-vnc-sasl +SAMBA_USES= samba:run # smbd +SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 STATIC_LINK_CONFIGURE_ON= --static STATIC_LINK_PREVENTS= GTK3 X11 STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static -NCURSES_USES= ncurses:base -SAMBA_USES= samba:run # smbd -SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd -DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html \ - sphinx-build:textproc/py-sphinx -DOCS_USES= makeinfo -DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1 +USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir +USBREDIR_CONFIGURE_OFF= --disable-usb-redir +USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir +VDE_CONFIGURE_OFF= --disable-vde +VDE_LIB_DEPENDS= libvdeplug.so:net/vde2 +X11_CONFIGURE_ENABLE= sdl +X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2 +X11_USES= sdl -PORTDOCS= docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \ - qemu-qmp-ref.html qemu-qmp-ref.txt specs/.buildinfo specs/* +PORTDOCS= docs index.html interop/.buildinfo interop/* \ + specs/.buildinfo specs/* system/.buildinfo system/* \ + tools/.buildinfo tools/* user/.buildinfo user/* WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} @@ -128,26 +141,19 @@ CONFIGURE_ARGS+= --sparc_cpu=v9 PLIST_SUB+= LINUXBOOT_DMA="" -# -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC) -# but it shouldn't matter much post-patch: - @${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \ - -e '/libusb/s/ --atleast-version=1\.0\.[0-9]*//' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -E \ - -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ - -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ - ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/etc/qemu-ifup|${PREFIX}/etc/qemu-ifup|' \ + -e 's|/etc/qemu-ifdown|${PREFIX}/etc/qemu-ifdown|' \ + ${WRKSRC}/include/net/net.h post-patch-CDROM_DMA-off: @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h -# XXX need to disable usb host code on head while it's not ported to the -# new usb stack yet -post-configure: - @${REINPLACE_CMD} -E \ - -e "s|^(HOST_USB=)bsd|\1stub|" \ - ${WRKSRC}/config-host.mak +do-build: + cd ${WRKSRC} && ${GMAKE} + +do-install: + cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install .if !target(post-install) post-install: Modified: head/emulators/qemu-devel/distinfo ============================================================================== --- head/emulators/qemu-devel/distinfo Sat Sep 12 22:17:52 2020 (r548427) +++ head/emulators/qemu-devel/distinfo Sat Sep 12 22:25:06 2020 (r548428) @@ -1,3 +1,13 @@ -TIMESTAMP = 1580929824 -SHA256 (qemu/4.2.0/qemu-4.2.0.tar.xz) = d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0 -SIZE (qemu/4.2.0/qemu-4.2.0.tar.xz) = 62222068 +TIMESTAMP = 1599741546 +SHA256 (qemu/5.1.0.20200909/qemu-qemu-5.1.0.20200909-9435a8b_GH0.tar.gz) = c1a6fef66638e4c691e340e56fac64b43088020c02578931a540931ba00b3746 +SIZE (qemu/5.1.0.20200909/qemu-qemu-5.1.0.20200909-9435a8b_GH0.tar.gz) = 29466042 +SHA256 (qemu/5.1.0.20200909/qemu-keycodemapdb-6b3d716_GH0.tar.gz) = c9d3412510aac999865d01aaa14b1fa8dc0385db55c5cf6c4d95d160bd0eaee9 +SIZE (qemu/5.1.0.20200909/qemu-keycodemapdb-6b3d716_GH0.tar.gz) = 47905 +SHA256 (qemu/5.1.0.20200909/qemu-dtc-85e5d83_GH0.tar.gz) = 3507d8e96d1942493128591b518c522cfd56d7779ce53283b2cf33661b809479 +SIZE (qemu/5.1.0.20200909/qemu-dtc-85e5d83_GH0.tar.gz) = 200566 +SHA256 (qemu/5.1.0.20200909/mesonbuild-meson-68ed748_GH0.tar.gz) = 4e49eae5684774dbe5503c4fccb8b3e8744d2c9dc4ad5ae489a5d8f21cedc7ac +SIZE (qemu/5.1.0.20200909/mesonbuild-meson-68ed748_GH0.tar.gz) = 2309591 +SHA256 (qemu/5.1.0.20200909/cota-berkeley-softfloat-3-b64af41_GH0.tar.gz) = f22bf52cc980b122c663f2e22f8098fa60d8e468e0095f1da58231235a6b324e +SIZE (qemu/5.1.0.20200909/cota-berkeley-softfloat-3-b64af41_GH0.tar.gz) = 148768 +SHA256 (qemu/5.1.0.20200909/cota-berkeley-testfloat-3-5a59dce_GH0.tar.gz) = 3bfd602c8563bc05b540aa4d50e3231b283bf4fddc67e9edb80bf9bcb617df4a +SIZE (qemu/5.1.0.20200909/cota-berkeley-testfloat-3-5a59dce_GH0.tar.gz) = 138950 Modified: head/emulators/qemu-devel/files/patch-configure ============================================================================== --- head/emulators/qemu-devel/files/patch-configure Sat Sep 12 22:17:52 2020 (r548427) +++ head/emulators/qemu-devel/files/patch-configure Sat Sep 12 22:25:06 2020 (r548428) @@ -1,36 +1,15 @@ ---- configure.orig 2019-12-12 18:20:47 UTC +--- configure.orig 2020-09-08 20:21:13 UTC +++ configure -@@ -405,7 +405,7 @@ DSOSUF=".so" - LDFLAGS_SHARED="-shared" - modules="no" - prefix="/usr/local" --mandir="\${prefix}/share/man" -+mandir="\${prefix}/man" - datadir="\${prefix}/share" - firmwarepath="\${prefix}/share/qemu-firmware" - qemu_docdir="\${prefix}/share/doc/qemu" -@@ -489,6 +489,9 @@ numa="" - tcmalloc="no" - jemalloc="no" - replication="yes" -+pcap="no" -+pcap_create="no" -+bpf="no" - vxhs="" - bochs="yes" - cloop="yes" -@@ -1125,6 +1128,10 @@ for opt do - ;; - --enable-vnc-png) vnc_png="yes" - ;; -+ --enable-pcap) pcap="yes" -+ ;; -+ --disable-pcap) pcap="no" -+ ;; - --disable-slirp) slirp="no" - ;; - --enable-slirp=git) slirp="git" -@@ -3023,6 +3030,14 @@ if ! check_include "ifaddrs.h" ; then +@@ -1640,7 +1647,7 @@ if test "$mingw32" = "yes" ; then + sysconfdir="$prefix" + local_statedir= + else +- mandir="${mandir:-$prefix/share/man}" ++ mandir="${mandir:-$prefix/man}" + datadir="${datadir:-$prefix/share}" + docdir="${docdir:-$prefix/share/doc}" + bindir="${bindir:-$prefix/bin}" +@@ -3279,6 +3286,14 @@ if check_include "sys/signal.h" ; then fi ########################################## @@ -45,28 +24,22 @@ # VTE probe if test "$vte" != "no"; then -@@ -3710,7 +3725,7 @@ for i in $glib_modules; do - glib_libs=$($pkg_config --libs $i) - QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" - LIBS="$glib_libs $LIBS" -- libs_qga="$glib_libs $libs_qga" -+ libs_qga="$glib_libs -lintl $libs_qga" - else - error_exit "glib-$glib_req_ver $i is required to compile QEMU" - fi -@@ -4802,11 +4817,6 @@ has_sphinx_build() { - if test "$docs" != "no" ; then - if has makeinfo && has pod2man && has_sphinx_build; then +@@ -4870,14 +4885,6 @@ if test "$docs" != "no" ; then + fi + if has makeinfo && has pod2man && test "$sphinx_ok" = "yes"; then docs=yes - else - if test "$docs" = "yes" ; then -- feature_not_found "docs" "Install texinfo, Perl/perl-podlators and python-sphinx" +- if has $sphinx_build && test "$sphinx_ok" != "yes"; then +- echo "Warning: $sphinx_build exists but it is either too old or uses too old a Python version" >&2 +- fi +- feature_not_found "docs" "Install texinfo, Perl/perl-podlators and a Python 3 version of python-sphinx" - fi - docs=no fi fi -@@ -4940,7 +4950,7 @@ fi +@@ -4993,7 +5000,7 @@ fi # check for libusb if test "$libusb" != "no" ; then @@ -75,133 +48,7 @@ libusb="yes" libusb_cflags=$($pkg_config --cflags libusb-1.0) libusb_libs=$($pkg_config --libs libusb-1.0) -@@ -5330,7 +5340,51 @@ if test "$debug_stack_usage" = "yes"; then - fi - fi - -+########################################## -+# pcap probe - -+if test "$pcap" = "yes" -a "$pcap" != "no"; then -+ cat > $TMPC << EOF -+#include <pcap.h> -+int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); } -+EOF -+ if test "$mingw32" = "no" ; then -+ libpcap=-lpcap -+ else -+ libpcap=-lwpcap -+ fi -+ if compile_prog "" "$libpcap" ; then -+ : -+ else -+ echo -+ echo "Error: Could not find pcap" -+ echo "Make sure to have the pcap libs and headers installed." -+ echo -+ exit 1 -+ fi -+ cat > $TMPC << EOF -+#include <pcap.h> -+int main(void) -+{ -+ char errbuf[PCAP_ERRBUF_SIZE]; -+ return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0); -+} -+EOF -+ if compile_prog "" "$libpcap" ; then -+ pcap_create="yes" -+ fi -+ cat > $TMPC << EOF -+#define PCAP_DONT_INCLUDE_PCAP_BPF_H -+#include <pcap.h> -+#include <net/bpf.h> -+int main(void) { return (BPF_MAJOR_VERSION); } -+EOF -+ if compile_prog ; then -+ bpf="yes" -+ fi -+ libs_softmmu="$libpcap $libs_softmmu" -+fi # test "$pcap" -+ - ########################################## - # check if we have open_by_handle_at - -@@ -6352,27 +6406,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] - cat > $TMPC <<EOF - int main(void) { return 0; } - EOF -- textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" -+ textseg_ldflags="-Wl,--image-base=$textseg_addr" - if ! compile_prog "" "$textseg_ldflags"; then -- # In case ld does not support -Ttext-segment, edit the default linker -- # script via sed to set the .text start addr. This is needed on FreeBSD -- # at least. -- if ! $ld --verbose >/dev/null 2>&1; then -- error_exit \ -- "We need to link the QEMU user mode binaries at a" \ -- "specific text address. Unfortunately your linker" \ -- "doesn't support either the -Ttext-segment option or" \ -- "printing the default linker script with --verbose." \ -- "If you don't want the user mode binaries, pass the" \ -- "--disable-user option to configure." -- fi -+ textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" -+ if ! compile_prog "" "$textseg_ldflags"; then -+ # In case ld does not support -Ttext-segment, edit the default linker -+ # script via sed to set the .text start addr. This is needed on FreeBSD -+ # at least. -+ if ! $ld --verbose >/dev/null 2>&1; then -+ error_exit \ -+ "We need to link the QEMU user mode binaries at a" \ -+ "specific text address. Unfortunately your linker" \ -+ "doesn't support either the -Ttext-segment option or" \ -+ "printing the default linker script with --verbose." \ -+ "If you don't want the user mode binaries, pass the" \ -+ "--disable-user option to configure." -+ fi - -- $ld --verbose | sed \ -- -e '1,/==================================================/d' \ -- -e '/==================================================/,$d' \ -- -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ -- -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld -- textseg_ldflags="-Wl,-T../config-host.ld" -+ $ld --verbose | sed \ -+ -e '1,/==================================================/d' \ -+ -e '/==================================================/,$d' \ -+ -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ -+ -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld -+ textseg_ldflags="-Wl,-T../config-host.ld" -+ fi - fi - fi - fi -@@ -6497,6 +6554,7 @@ echo "Audio drivers $audio_drv_list" - echo "Block whitelist (rw) $block_drv_rw_whitelist" - echo "Block whitelist (ro) $block_drv_ro_whitelist" - echo "VirtFS support $virtfs" -+echo "pcap support $pcap" - echo "Multipath support $mpath" - echo "VNC support $vnc" - if test "$vnc" = "yes" ; then -@@ -6739,6 +6797,15 @@ fi - if test "$want_tools" = "yes" ; then - echo "CONFIG_TOOLS=y" >> $config_host_mak - fi -+if test "$pcap" = "yes" ; then -+ echo "CONFIG_PCAP=y" >> $config_host_mak -+ if test "$pcap_create" = "yes" ; then -+ echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak -+ fi -+ if test "$bpf" = "yes" ; then -+ echo "CONFIG_BPF=y" >> $config_host_mak -+ fi -+fi - if test "$slirp" != "no"; then - echo "CONFIG_SLIRP=y" >> $config_host_mak - echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -@@ -6986,6 +7053,9 @@ fi +@@ -6864,6 +6927,9 @@ fi # if this macro is set. if test "$have_fsxattr" = "yes" ; then echo "HAVE_FSXATTR=y" >> $config_host_mak Added: head/emulators/qemu-devel/files/patch-docs_system_qemu-cpu-models.rst ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/qemu-devel/files/patch-docs_system_qemu-cpu-models.rst Sat Sep 12 22:25:06 2020 (r548428) @@ -0,0 +1,8 @@ +--- docs/system/qemu-cpu-models.rst.orig 2020-07-28 20:52:47 UTC ++++ docs/system/qemu-cpu-models.rst +@@ -17,4 +17,4 @@ Description + See also + '''''''' + +-The HTML documentation of QEMU for more precise information and Linux user mode emulator invocation. ++The HTML documentation of QEMU for more precise information and Linux user mode emulator invocation, as well as the FreeBSD host notes in pkg-message in the relevant qemu port directory. Modified: head/emulators/qemu-devel/pkg-plist ============================================================================== --- head/emulators/qemu-devel/pkg-plist Sat Sep 12 22:17:52 2020 (r548427) +++ head/emulators/qemu-devel/pkg-plist Sat Sep 12 22:25:06 2020 (r548428) @@ -8,8 +8,10 @@ bin/qemu-io bin/qemu-nbd %%NO_X86_TARGETS%%bin/qemu-sparc %%NO_X86_TARGETS%%bin/qemu-sparc64 +bin/qemu-storage-daemon %%NO_X86_TARGETS%%bin/qemu-system-aarch64 %%NO_X86_TARGETS%%bin/qemu-system-alpha +%%NO_X86_TARGETS%%bin/qemu-system-avr %%NO_X86_TARGETS%%bin/qemu-system-arm %%NO_X86_TARGETS%%bin/qemu-system-cris %%NO_X86_TARGETS%%bin/qemu-system-hppa @@ -29,6 +31,7 @@ bin/qemu-system-i386 %%NO_X86_TARGETS%%bin/qemu-system-ppc64 %%NO_X86_TARGETS%%bin/qemu-system-riscv32 %%NO_X86_TARGETS%%bin/qemu-system-riscv64 +%%NO_X86_TARGETS%%bin/qemu-system-rx %%NO_X86_TARGETS%%bin/qemu-system-s390x %%NO_X86_TARGETS%%bin/qemu-system-sh4 %%NO_X86_TARGETS%%bin/qemu-system-sh4eb @@ -80,18 +83,20 @@ man/man8/qemu-nbd.8.gz %%DATADIR%%/firmware/60-edk2-i386.json %%DATADIR%%/firmware/60-edk2-x86_64.json %%DATADIR%%/hppa-firmware.img +%%DATADIR%%/keymaps/sl +%%DATADIR%%/keymaps/sv %%DATADIR%%/linuxboot.bin %%LINUXBOOT_DMA%%%%DATADIR%%/linuxboot_dma.bin %%DATADIR%%/multiboot.bin %%DATADIR%%/openbios-ppc %%DATADIR%%/openbios-sparc32 %%DATADIR%%/openbios-sparc64 -%%DATADIR%%/opensbi-riscv32-virt-fw_jump.bin -%%DATADIR%%/opensbi-riscv64-sifive_u-fw_jump.bin -%%DATADIR%%/opensbi-riscv64-virt-fw_jump.bin +%%DATADIR%%/opensbi-riscv32-generic-fw_dynamic.bin +%%DATADIR%%/opensbi-riscv32-generic-fw_dynamic.elf +%%DATADIR%%/opensbi-riscv64-generic-fw_dynamic.bin +%%DATADIR%%/opensbi-riscv64-generic-fw_dynamic.elf %%DATADIR%%/palcode-clipper %%DATADIR%%/petalogix-ml605.dtb -%%DATADIR%%/ppc_rom.bin %%DATADIR%%/pxe-e1000.rom %%DATADIR%%/pxe-eepro100.rom %%DATADIR%%/pxe-ne2k_pci.rom @@ -118,40 +123,6 @@ man/man8/qemu-nbd.8.gz %%DATADIR%%/bamboo.dtb %%DATADIR%%/kvmvapic.bin %%DATADIR%%/u-boot.e500 -%%DATADIR%%/keymaps/ar -%%DATADIR%%/keymaps/bepo -%%DATADIR%%/keymaps/cz -%%DATADIR%%/keymaps/da -%%DATADIR%%/keymaps/de -%%DATADIR%%/keymaps/de-ch -%%DATADIR%%/keymaps/en-gb -%%DATADIR%%/keymaps/en-us -%%DATADIR%%/keymaps/es -%%DATADIR%%/keymaps/et -%%DATADIR%%/keymaps/fi -%%DATADIR%%/keymaps/fo -%%DATADIR%%/keymaps/fr -%%DATADIR%%/keymaps/fr-be -%%DATADIR%%/keymaps/fr-ca -%%DATADIR%%/keymaps/fr-ch -%%DATADIR%%/keymaps/hr -%%DATADIR%%/keymaps/hu -%%DATADIR%%/keymaps/is -%%DATADIR%%/keymaps/it -%%DATADIR%%/keymaps/ja -%%DATADIR%%/keymaps/lt -%%DATADIR%%/keymaps/lv -%%DATADIR%%/keymaps/mk -%%DATADIR%%/keymaps/nl -%%DATADIR%%/keymaps/no -%%DATADIR%%/keymaps/pl -%%DATADIR%%/keymaps/pt -%%DATADIR%%/keymaps/pt-br -%%DATADIR%%/keymaps/ru -%%DATADIR%%/keymaps/sl -%%DATADIR%%/keymaps/sv -%%DATADIR%%/keymaps/th -%%DATADIR%%/keymaps/tr %%DATADIR%%/pvh.bin %%DATADIR%%/vgabios-bochs-display.bin %%DATADIR%%/vgabios-ramfb.bin @@ -171,5 +142,6 @@ share/applications/qemu.desktop %%GTK3%%share/locale/fr_FR/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/hu/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/it/LC_MESSAGES/qemu.mo +%%GTK3%%share/locale/sv/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/tr/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/zh_CN/LC_MESSAGES/qemu.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009122225.08CMP6EQ094389>