Date: Sat, 18 Jul 2020 19:42:00 +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: r542523 - in head: . emulators/qemu emulators/qemu/files Message-ID: <202007181942.06IJg0YA028982@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Sat Jul 18 19:41:59 2020 New Revision: 542523 URL: https://svnweb.freebsd.org/changeset/ports/542523 Log: emulators/qemu: Update version 4.1.1=>4.2.1 - Add OPTION CAPSTONE [1] PR: 247870 [1] Reported by: amdmi3 [1] Modified: head/UPDATING head/emulators/qemu/Makefile head/emulators/qemu/distinfo head/emulators/qemu/files/patch-Makefile head/emulators/qemu/files/patch-configure head/emulators/qemu/files/patch-include_net_net.h head/emulators/qemu/files/patch-include_qemu_atomic.h head/emulators/qemu/files/patch-qemu-doc.texi head/emulators/qemu/files/pcap-patch-net_net.c head/emulators/qemu/files/pcap-patch-qapi_net.json head/emulators/qemu/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Jul 18 19:12:26 2020 (r542522) +++ head/UPDATING Sat Jul 18 19:41:59 2020 (r542523) @@ -6,6 +6,20 @@ You should get into the habit of checking this file fo you update your ports collection, before attempting any port upgrades. +20200719: + AFFECTS: users of emulators/qemu + AUTHOR: bofh@FreeBSD.org + + emulators/qemu has been updated to 4.2.1. Previous 4.1.X branch has + been repocopied to emulators/qemu41. If someone wants to stick with 4.1.X + branch please use one of the following command: + + # pkg install emulators/qemu41 + or + # portmaster -o emulators/qemu41 emulators/qemu + or + # portupgrade -o emulators/qemu41 emulators/qemu + 20200716: AFFECTS: users of shells/bash, shells/bash-static AUTHOR: ehaupt@FreeBSD.org Modified: head/emulators/qemu/Makefile ============================================================================== --- head/emulators/qemu/Makefile Sat Jul 18 19:12:26 2020 (r542522) +++ head/emulators/qemu/Makefile Sat Jul 18 19:41:59 2020 (r542523) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 4.1.1 -PORTREVISION= 4 +PORTVERSION= 4.2.1 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -30,14 +29,14 @@ USE_GNOME= cairo glib20 libxml2 USE_PERL5= build -PORTSCOUT= limit:^4\.1\. +PORTSCOUT= limit:^4\.2\. 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 ISCSI + STATIC_LINK DOCS ISCSI CAPSTONE OPTIONS_SINGLE= NCURSES OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT CDROM_DMA_DESC= IDE CDROM DMA @@ -55,8 +54,12 @@ STATIC_LINK_DESC= Statically link the executables USBREDIR_DESC= usb device network redirection (experimental!) VDE_DESC= vde dependency (for vde networking) X86_TARGETS_DESC= Build only x86 system targets +CAPSTONE_DESC= Disassembly framework support OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES_DEFAULT VDE OPTIONS_SUB= yes +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 Modified: head/emulators/qemu/distinfo ============================================================================== --- head/emulators/qemu/distinfo Sat Jul 18 19:12:26 2020 (r542522) +++ head/emulators/qemu/distinfo Sat Jul 18 19:41:59 2020 (r542523) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574567528 -SHA256 (qemu/4.1.1/qemu-4.1.1.tar.xz) = ed6fdbbdd272611446ff8036991e9b9f04a2ab2e3ffa9e79f3bab0eb9a95a1d2 -SIZE (qemu/4.1.1/qemu-4.1.1.tar.xz) = 61932460 +TIMESTAMP = 1594330010 +SHA256 (qemu/4.2.1/qemu-4.2.1.tar.xz) = 7e331163b72e7bcf63bd35cb85cba87b48d12fab3f264b94c23f7d3991094207 +SIZE (qemu/4.2.1/qemu-4.2.1.tar.xz) = 62225124 Modified: head/emulators/qemu/files/patch-Makefile ============================================================================== --- head/emulators/qemu/files/patch-Makefile Sat Jul 18 19:12:26 2020 (r542522) +++ head/emulators/qemu/files/patch-Makefile Sat Jul 18 19:41:59 2020 (r542523) @@ -1,22 +1,22 @@ ---- Makefile.orig 2019-04-23 18:14:45 UTC +--- Makefile.orig 2019-12-12 18:20:47 UTC +++ Makefile -@@ -311,9 +311,14 @@ LIBS+=-lz $(LIBS_TOOLS) - HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF) +@@ -342,9 +342,14 @@ MANUAL_BUILDDIR := docs + endif ifdef BUILD_DOCS +ifdef NOPORTDOCS +DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 +DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 +else - DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 + DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8 DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7 +endif DOCS+=docs/qemu-block-drivers.7 DOCS+=docs/qemu-cpu-models.7 ifdef CONFIG_VIRTFS -@@ -742,11 +747,13 @@ install-sphinxdocs: sphinxdocs - $(call install-manual,interop) +@@ -819,11 +824,13 @@ install-sphinxdocs: sphinxdocs + $(call install-manual,specs) install-doc: $(DOCS) install-sphinxdocs +ifndef NOPORTDOCS @@ -29,10 +29,10 @@ ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" -@@ -764,8 +771,10 @@ ifdef CONFIG_TRACE_SYSTEMTAP +@@ -841,8 +848,10 @@ ifdef CONFIG_TRACE_SYSTEMTAP endif ifneq (,$(findstring qemu-ga,$(TOOLS))) - $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" + $(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-ga.8 "$(DESTDIR)$(mandir)/man8" +ifndef NOPORTDOCS $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" Modified: head/emulators/qemu/files/patch-configure ============================================================================== --- head/emulators/qemu/files/patch-configure Sat Jul 18 19:12:26 2020 (r542522) +++ head/emulators/qemu/files/patch-configure Sat Jul 18 19:41:59 2020 (r542523) @@ -1,6 +1,6 @@ ---- configure.orig 2019-11-14 18:06:20 UTC +--- configure.orig 2019-12-12 18:20:47 UTC +++ configure -@@ -404,7 +404,7 @@ DSOSUF=".so" +@@ -405,7 +405,7 @@ DSOSUF=".so" LDFLAGS_SHARED="-shared" modules="no" prefix="/usr/local" @@ -9,7 +9,7 @@ datadir="\${prefix}/share" firmwarepath="\${prefix}/share/qemu-firmware" qemu_docdir="\${prefix}/share/doc/qemu" -@@ -484,6 +484,9 @@ numa="" +@@ -489,6 +489,9 @@ numa="" tcmalloc="no" jemalloc="no" replication="yes" @@ -19,7 +19,7 @@ vxhs="" bochs="yes" cloop="yes" -@@ -1141,6 +1144,10 @@ for opt do +@@ -1125,6 +1128,10 @@ for opt do ;; --enable-vnc-png) vnc_png="yes" ;; @@ -30,7 +30,7 @@ --disable-slirp) slirp="no" ;; --enable-slirp=git) slirp="git" -@@ -2998,6 +3005,14 @@ if ! check_include "ifaddrs.h" ; then +@@ -3023,6 +3030,14 @@ if ! check_include "ifaddrs.h" ; then fi ########################################## @@ -45,7 +45,7 @@ # VTE probe if test "$vte" != "no"; then -@@ -3655,7 +3670,7 @@ for i in $glib_modules; do +@@ -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" @@ -54,7 +54,7 @@ else error_exit "glib-$glib_req_ver $i is required to compile QEMU" fi -@@ -4747,11 +4762,6 @@ has_sphinx_build() { +@@ -4802,11 +4817,6 @@ has_sphinx_build() { if test "$docs" != "no" ; then if has makeinfo && has pod2man && has_sphinx_build; then docs=yes @@ -66,7 +66,7 @@ fi fi -@@ -4885,7 +4895,7 @@ fi +@@ -4940,7 +4950,7 @@ fi # check for libusb if test "$libusb" != "no" ; then @@ -75,7 +75,7 @@ libusb="yes" libusb_cflags=$($pkg_config --cflags libusb-1.0) libusb_libs=$($pkg_config --libs libusb-1.0) -@@ -5275,7 +5285,51 @@ if test "$debug_stack_usage" = "yes"; then +@@ -5330,7 +5340,51 @@ if test "$debug_stack_usage" = "yes"; then fi fi @@ -127,7 +127,7 @@ ########################################## # check if we have open_by_handle_at -@@ -6241,27 +6295,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] +@@ -6352,27 +6406,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] cat > $TMPC <<EOF int main(void) { return 0; } EOF @@ -148,18 +148,18 @@ - 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 ++ # 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' \ @@ -167,17 +167,17 @@ - -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" ++ $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 -@@ -6377,6 +6434,7 @@ echo "Audio drivers $audio_drv_list" +@@ -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" @@ -185,9 +185,9 @@ echo "Multipath support $mpath" echo "VNC support $vnc" if test "$vnc" = "yes" ; then -@@ -6617,6 +6675,15 @@ fi - if test "$profiler" = "yes" ; then - echo "CONFIG_PROFILER=y" >> $config_host_mak +@@ -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 @@ -201,7 +201,7 @@ if test "$slirp" != "no"; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -@@ -6864,6 +6931,9 @@ fi +@@ -6986,6 +7053,9 @@ fi # if this macro is set. if test "$have_fsxattr" = "yes" ; then echo "HAVE_FSXATTR=y" >> $config_host_mak Modified: head/emulators/qemu/files/patch-include_net_net.h ============================================================================== --- head/emulators/qemu/files/patch-include_net_net.h Sat Jul 18 19:12:26 2020 (r542522) +++ head/emulators/qemu/files/patch-include_net_net.h Sat Jul 18 19:41:59 2020 (r542523) @@ -1,6 +1,6 @@ ---- include/net/net.h.orig 2019-04-23 18:14:46 UTC +--- include/net/net.h.orig 2020-06-25 18:12:17 UTC +++ include/net/net.h -@@ -209,8 +209,8 @@ void qmp_netdev_add(QDict *qdict, QObject **ret, Error +@@ -208,8 +208,8 @@ void qmp_netdev_add(QDict *qdict, QObject **ret, Error int net_hub_id_for_client(NetClientState *nc, int *id); NetClientState *net_hub_port_find(int hub_id); Modified: head/emulators/qemu/files/patch-include_qemu_atomic.h ============================================================================== --- head/emulators/qemu/files/patch-include_qemu_atomic.h Sat Jul 18 19:12:26 2020 (r542522) +++ head/emulators/qemu/files/patch-include_qemu_atomic.h Sat Jul 18 19:41:59 2020 (r542523) @@ -1,6 +1,6 @@ ---- include/qemu/atomic.h.orig 2019-04-23 18:14:46 UTC +--- include/qemu/atomic.h.orig 2020-06-25 18:12:17 UTC +++ include/qemu/atomic.h -@@ -201,10 +201,12 @@ +@@ -208,10 +208,12 @@ /* Provide shorter names for GCC atomic builtins, return old value */ #define atomic_fetch_inc(ptr) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST) #define atomic_fetch_dec(ptr) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST) @@ -13,7 +13,7 @@ #define atomic_fetch_xor(ptr, n) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST) #define atomic_inc_fetch(ptr) __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST) -@@ -218,10 +220,12 @@ +@@ -225,10 +227,12 @@ /* And even shorter names that return void. */ #define atomic_inc(ptr) ((void) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST)) #define atomic_dec(ptr) ((void) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST)) @@ -26,7 +26,7 @@ #define atomic_xor(ptr, n) ((void) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST)) #else /* __ATOMIC_RELAXED */ -@@ -389,10 +393,12 @@ +@@ -400,10 +404,12 @@ #define atomic_inc_fetch(ptr) __sync_add_and_fetch(ptr, 1) #define atomic_dec_fetch(ptr) __sync_add_and_fetch(ptr, -1) @@ -39,7 +39,7 @@ #define atomic_xor_fetch(ptr, n) __sync_xor_and_fetch(ptr, n) #define atomic_cmpxchg(ptr, old, new) __sync_val_compare_and_swap(ptr, old, new) -@@ -401,10 +407,12 @@ +@@ -412,10 +418,12 @@ /* And even shorter names that return void. */ #define atomic_inc(ptr) ((void) __sync_fetch_and_add(ptr, 1)) #define atomic_dec(ptr) ((void) __sync_fetch_and_add(ptr, -1)) Modified: head/emulators/qemu/files/patch-qemu-doc.texi ============================================================================== --- head/emulators/qemu/files/patch-qemu-doc.texi Sat Jul 18 19:12:26 2020 (r542522) +++ head/emulators/qemu/files/patch-qemu-doc.texi Sat Jul 18 19:41:59 2020 (r542523) @@ -1,6 +1,6 @@ ---- qemu-doc.texi.orig 2019-04-23 18:14:46 UTC +--- qemu-doc.texi.orig 2020-06-25 18:12:17 UTC +++ qemu-doc.texi -@@ -200,7 +200,7 @@ VGA BIOS. +@@ -205,7 +205,7 @@ VGA BIOS. QEMU uses YM3812 emulation by Tatsuyuki Satoh. QEMU uses GUS emulation (GUSEMU32 @url{http://www.deinmeister.de/gusemu/}) @@ -9,7 +9,7 @@ Note that, by default, GUS shares IRQ(7) with parallel ports and so QEMU must be told to not have parallel ports to have working GUS. -@@ -560,7 +560,8 @@ Send the escape character to the frontend +@@ -573,7 +573,8 @@ Send the escape character to the frontend @c man begin SEEALSO The HTML documentation of QEMU for more precise information and Linux Modified: head/emulators/qemu/files/pcap-patch-net_net.c ============================================================================== --- head/emulators/qemu/files/pcap-patch-net_net.c Sat Jul 18 19:12:26 2020 (r542522) +++ head/emulators/qemu/files/pcap-patch-net_net.c Sat Jul 18 19:41:59 2020 (r542523) @@ -1,6 +1,6 @@ ---- net/net.c.orig 2018-04-24 16:30:47 UTC +--- net/net.c.orig 2020-06-25 18:12:17 UTC +++ net/net.c -@@ -52,6 +52,11 @@ +@@ -55,6 +55,11 @@ #include "net/filter.h" #include "qapi/string-output-visitor.h" @@ -12,7 +12,7 @@ /* Net bridge is currently not supported for W32. */ #if !defined(_WIN32) # define CONFIG_NET_BRIDGE -@@ -929,7 +934,225 @@ static int net_init_nic(const Netdev *netdev, const ch +@@ -935,7 +940,226 @@ static int net_init_nic(const Netdev *netdev, const ch return idx; } @@ -95,6 +95,7 @@ + struct PCAPState *s; + const char *ifname; + char errbuf[PCAP_ERRBUF_SIZE]; ++ pcap_if_t *alldevsp; +#if defined(_WIN32) + HANDLE h; +#endif @@ -111,7 +112,7 @@ + nc = qemu_new_net_client(&net_pcap_info, peer, "pcap", ifname); + s = DO_UPCAST(struct PCAPState, nc, nc); + -+ if (ifname == NULL && (ifname = pcap_lookupdev(errbuf)) == NULL) { ++ if (ifname == NULL && (ifname = pcap_findalldevs(&alldevsp, errbuf)) == NULL) { + fprintf(stderr, "qemu: pcap_create: %s\n", errbuf); + goto fail; + } @@ -238,7 +239,7 @@ static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])( const Netdev *netdev, const char *name, -@@ -955,6 +1178,9 @@ static int (* const net_client_init_fun[NET_CLIENT_DRI +@@ -961,6 +1185,9 @@ static int (* const net_client_init_fun[NET_CLIENT_DRI #endif #ifdef CONFIG_L2TPV3 [NET_CLIENT_DRIVER_L2TPV3] = net_init_l2tpv3, Modified: head/emulators/qemu/files/pcap-patch-qapi_net.json ============================================================================== --- head/emulators/qemu/files/pcap-patch-qapi_net.json Sat Jul 18 19:12:26 2020 (r542522) +++ head/emulators/qemu/files/pcap-patch-qapi_net.json Sat Jul 18 19:41:59 2020 (r542523) @@ -1,6 +1,6 @@ ---- qapi/net.json.orig 2018-04-24 16:30:47 UTC +--- qapi/net.json.orig 2020-06-25 18:12:17 UTC +++ qapi/net.json -@@ -388,6 +388,19 @@ +@@ -385,6 +385,19 @@ '*helper': 'str' } } ## @@ -20,7 +20,7 @@ # @NetdevHubPortOptions: # # Connect two or more net clients through a software hub. -@@ -454,7 +467,7 @@ +@@ -451,7 +464,7 @@ ## { 'enum': 'NetClientDriver', 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', @@ -29,7 +29,7 @@ ## # @Netdev: -@@ -478,6 +491,7 @@ +@@ -474,6 +487,7 @@ 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', 'l2tpv3': 'NetdevL2TPv3Options', @@ -37,7 +37,7 @@ 'socket': 'NetdevSocketOptions', 'vde': 'NetdevVdeOptions', 'bridge': 'NetdevBridgeOptions', -@@ -514,7 +528,7 @@ +@@ -509,7 +523,7 @@ ## { 'enum': 'NetLegacyOptionsType', 'data': ['none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', @@ -46,7 +46,7 @@ ## # @NetLegacyOptions: -@@ -532,6 +546,7 @@ +@@ -526,6 +540,7 @@ 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', 'l2tpv3': 'NetdevL2TPv3Options', Modified: head/emulators/qemu/pkg-plist ============================================================================== --- head/emulators/qemu/pkg-plist Sat Jul 18 19:12:26 2020 (r542522) +++ head/emulators/qemu/pkg-plist Sat Jul 18 19:41:59 2020 (r542523) @@ -52,8 +52,8 @@ man/man8/qemu-nbd.8.gz @sample etc/qemu-ifdown.sample %%DATADIR%%/QEMU,tcx.bin %%DATADIR%%/QEMU,cgthree.bin -%%DATADIR%%/bamboo.dtb %%DATADIR%%/bios-256k.bin +%%DATADIR%%/bios-microvm.bin %%DATADIR%%/bios.bin %%DATADIR%%/canyonlands.dtb %%DATADIR%%/edk2-aarch64-code.fd @@ -80,6 +80,44 @@ man/man8/qemu-nbd.8.gz %%DATADIR%%/firmware/60-edk2-i386.json %%DATADIR%%/firmware/60-edk2-x86_64.json %%DATADIR%%/hppa-firmware.img +%%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%%/palcode-clipper +%%DATADIR%%/petalogix-ml605.dtb +%%DATADIR%%/ppc_rom.bin +%%DATADIR%%/pxe-e1000.rom +%%DATADIR%%/pxe-eepro100.rom +%%DATADIR%%/pxe-ne2k_pci.rom +%%DATADIR%%/pxe-rtl8139.rom +%%DATADIR%%/pxe-pcnet.rom +%%DATADIR%%/pxe-virtio.rom +%%DATADIR%%/qemu-nsis.bmp +%%DATADIR%%/qemu_vga.ndrv +%%DATADIR%%/s390-ccw.img +%%DATADIR%%/s390-netboot.img +%%DATADIR%%/slof.bin +%%DATADIR%%/u-boot-sam460-20100605.bin +%%DATADIR%%/vgabios.bin +%%DATADIR%%/vgabios-ati.bin +%%DATADIR%%/vgabios-cirrus.bin +%%DATADIR%%/vgabios-qxl.bin +%%DATADIR%%/vgabios-stdvga.bin +%%DATADIR%%/vgabios-virtio.bin +%%DATADIR%%/vgabios-vmware.bin +%%DATADIR%%/sgabios.bin +%%DATADIR%%/skiboot.lid +%%DATADIR%%/trace-events-all +%%DATADIR%%/petalogix-s3adsp1800.dtb +%%DATADIR%%/bamboo.dtb +%%DATADIR%%/kvmvapic.bin +%%DATADIR%%/u-boot.e500 %%DATADIR%%/keymaps/ar %%DATADIR%%/keymaps/bepo %%DATADIR%%/keymaps/cz @@ -114,47 +152,9 @@ man/man8/qemu-nbd.8.gz %%DATADIR%%/keymaps/sv %%DATADIR%%/keymaps/th %%DATADIR%%/keymaps/tr -%%DATADIR%%/kvmvapic.bin -%%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%%/palcode-clipper -%%DATADIR%%/petalogix-ml605.dtb -%%DATADIR%%/petalogix-s3adsp1800.dtb -%%DATADIR%%/ppc_rom.bin %%DATADIR%%/pvh.bin -%%DATADIR%%/pxe-e1000.rom -%%DATADIR%%/pxe-eepro100.rom -%%DATADIR%%/pxe-ne2k_pci.rom -%%DATADIR%%/pxe-rtl8139.rom -%%DATADIR%%/pxe-pcnet.rom -%%DATADIR%%/pxe-virtio.rom -%%DATADIR%%/qemu-nsis.bmp -%%DATADIR%%/qemu_vga.ndrv -%%DATADIR%%/s390-ccw.img -%%DATADIR%%/s390-netboot.img -%%DATADIR%%/sgabios.bin -%%DATADIR%%/skiboot.lid -%%DATADIR%%/slof.bin -%%DATADIR%%/spapr-rtas.bin -%%DATADIR%%/trace-events-all -%%DATADIR%%/u-boot-sam460-20100605.bin -%%DATADIR%%/u-boot.e500 -%%DATADIR%%/vgabios.bin %%DATADIR%%/vgabios-bochs-display.bin -%%DATADIR%%/vgabios-ati.bin -%%DATADIR%%/vgabios-cirrus.bin -%%DATADIR%%/vgabios-qxl.bin %%DATADIR%%/vgabios-ramfb.bin -%%DATADIR%%/vgabios-stdvga.bin -%%DATADIR%%/vgabios-virtio.bin -%%DATADIR%%/vgabios-vmware.bin share/icons/hicolor/128x128/apps/qemu.png share/icons/hicolor/16x16/apps/qemu.png share/icons/hicolor/24x24/apps/qemu.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007181942.06IJg0YA028982>