From nobody Fri Jan 20 19:27:56 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nz8fP0h6cz2v4vS; Fri, 20 Jan 2023 19:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nz8fP04hFz3Fsx; Fri, 20 Jan 2023 19:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674242877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DUToMkebyssdviBx8bL7tW/eZLb3U2NfnP8zQZYJc1I=; b=wFjrmYIl8pywOfjD05zFb4j7kuse7aWn3zfmTIKMNdE3JrMT7MQGCjdLK+Bg3YYr/3ffhN Iig3lJYVc2zsuP2CH6Syp0M0qQ6by7loob3pMrQI77d2NkcNgU0LHDIAMdMmg5UN/iB4Gf xZ2T9RdNoFn8mMX/ICMBJi1xWYcu0h4jarx6Yc6+WMupF/it8m28rzJbumv6q5tnvBAtvg EiWjDcsiJe/TDfWYV6UWrQORn5FBIR0HdUf24Dg1NL3/po/7vnM9rxNijAc1H44iWPK+uN cK96UEI3RyxBhlk9X+N74U6GSNJP8B84Xpl5QL60lE/WaUYzAyfYyM9H0C7rGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674242877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DUToMkebyssdviBx8bL7tW/eZLb3U2NfnP8zQZYJc1I=; b=AX4vdj2o4zCy3bGwIHKqA50HS5hGo+ePUSnTEwQfLCr/bdcaxsnKwzo4vRTrxWP1oOoEHG LQL1Q0JoLH0gFgNMeSylS8sLEmmWIwVPe2wvU/mxdpQmYcq7MMS/fTWD69POdg9DKbND6S N5PIANNIUoUT2A0OiEz6XLAmi7DrUkFc8kfL8Od3I1AQp0eK92et/p77m2KOnButpdjaZu nVi3a/bbnERGvrtERrokAWe4F3aDBvxjn1kvszC2glJ5YmWVcyrjOuXgJvGmf1GVXZWYLc fxGaYYWDoRX/NHFZDM00YoyYljJOo2yFCSfFwxai1NQdnChRRXlmtSpPXKs3QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674242877; a=rsa-sha256; cv=none; b=vCPEg8KFIlHvaBbIDo+N2dU9nPNr7+gl5Ht9hTyK8F6tkZeCSzt7eZzPmIBA++xfFDMFj8 9trXT376FBr5UBGVrxnkfvHCGOu+PTJqcD908bpKnz36KQA9qAXwDtJp7b0NuyzjSk2TWd N+tFZxqjYL1N8+0yrl40iwW/dO0KdMnWkryVpcgoHTgAF6HatC5DwkyJ/0nvz/k/7JsqXY Bh9Jjw1VQ8WRJpfGFa1BtjQas0ZG61kbBnnwLZta1BDqd1nK5yR3ja1Xk58H4lSZAZ30l3 +vPE2NYJp85MsWVMLZZyWUpv1EAURKneO/859qwFvKVGeeGePWvskE60/xEhMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nz8fN6FfZzhrL; Fri, 20 Jan 2023 19:27:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30KJRuOo014479; Fri, 20 Jan 2023 19:27:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KJRu4n014478; Fri, 20 Jan 2023 19:27:56 GMT (envelope-from git) Date: Fri, 20 Jan 2023 19:27:56 GMT Message-Id: <202301201927.30KJRu4n014478@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 564c4cb3d9bb - main - emulators/qemu: Add FLAVOR for the qemu guest agent List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 564c4cb3d9bb0aa87d676103fa164ea9833b7897 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=564c4cb3d9bb0aa87d676103fa164ea9833b7897 commit 564c4cb3d9bb0aa87d676103fa164ea9833b7897 Author: Ryan Steinmetz AuthorDate: 2023-01-20 19:26:34 +0000 Commit: Ryan Steinmetz CommitDate: 2023-01-20 19:26:34 +0000 emulators/qemu: Add FLAVOR for the qemu guest agent - Bump PORTREVISION Approved by: maintainer (via IRC) --- emulators/qemu/Makefile | 45 ++++++++++++++++++++------------ emulators/qemu/files/qemu-guest-agent.in | 31 ++++++++++++++++++++++ emulators/qemu/pkg-descr-ga | 11 ++++++++ emulators/qemu/pkg-plist-ga | 43 ++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+), 16 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index ab3651a9c86e..574efdcd571f 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,5 +1,6 @@ PORTNAME= qemu PORTVERSION= 7.2.0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -10,47 +11,52 @@ WWW= https://www.qemu.org/ LICENSE= GPLv2 -.if ${FLAVOR:U} != tools +.if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le # We need to check if it build with other ARCHS .endif BUILD_DEPENDS= bash:shells/bash -.if ${FLAVOR:U} != tools +.if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent LIB_DEPENDS+= libfdt.so:sysutils/dtc \ libzstd.so:archivers/zstd .endif -.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools) +.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent) LIB_DEPENDS+= libepoxy.so:graphics/libepoxy .endif -FLAVORS= default nox11 tools +FLAVORS= default nox11 tools guestagent FLAVOR?= ${FLAVORS:[1]} default_CONFLICTS_INSTALL= qemu-devel qemu-nox11 qemu-tools qemu-utils \ qemu6* qemu70* nox11_PKGNAMESUFFIX= -nox11 -nox11_CONFLICTS_INSTALL= qemu qemu-devel qemu6* qemu70* +nox11_CONFLICTS_INSTALL= qemu qemu-devel qemu6* qemu70* qemu-guest-agent nox11_COMMENT= (without X11) tools_PKGNAMESUFFIX= -tools tools_COMMENT= (tools only) tools_CONFLICTS_INSTALL= qemu qemu-devel qemu-nox11 qemu-utils qemu6* \ - qemu70* + qemu70* qemu-guest-agent tools_DESCR= ${.CURDIR}/pkg-descr-tools tools_PLIST= ${.CURDIR}/pkg-plist-tools +guestagent_PKGNAMESUFFIX= -guest-agent +guestagent_COMMENT= (guest agent) +guestagent_DESCR= ${.CURDIR}/pkg-descr-ga +guestagent_PLIST= ${.CURDIR}/pkg-plist-ga +guestagent_CONFLICTS_INSTALL= qemu qemu-devel qemu-nox11 qemu-tools qemu-utils qemu6* \ + qemu70* qemu-guest-agent USES= cpe gmake gnome ninja perl5 pkgconfig python:build tar:xz USE_GNOME= glib20 USE_PERL5= build -.if ${FLAVOR:U} != tools +.if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent USES+= iconv:wchar_t .endif -.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools) +.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent) USE_GNOME+= cairo .endif HAS_CONFIGURE= yes CONFIGURE_ARGS+= --cc=${CC} \ - --disable-guest-agent \ --disable-kvm \ --disable-linux-aio \ --disable-linux-user \ @@ -62,11 +68,17 @@ CONFIGURE_ARGS+= --cc=${CC} \ --mandir=${PREFIX}/man \ --prefix=${PREFIX} \ --python=${PYTHON_CMD} -.if ${FLAVOR:U} != tools +.if ${FLAVOR:U} == guestagent +USE_RC_SUBR= qemu-guest-agent +CONFIGURE_ARGS+= --enable-guest-agent --disable-tools --disable-xkbcommon +.else +CONFIGURE_ARGS+= --disable-guest-agent +.endif +.if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent CONFIGURE_ARGS+= --enable-fdt=system \ --enable-netmap .endif -.if ${FLAVOR:U} == tools +.if ${FLAVOR:U} == tools || ${FLAVOR:U} == guestagent CONFIGURE_ARGS+= --disable-attr \ --disable-blobs \ --disable-brlapi \ @@ -77,7 +89,6 @@ CONFIGURE_ARGS+= --disable-attr \ --disable-fdt \ --disable-gcrypt \ --disable-glusterfs \ - --disable-guest-agent \ --disable-libnfs \ --disable-libusb \ --disable-lzo \ @@ -95,8 +106,10 @@ CONFIGURE_ARGS+= --disable-attr \ --disable-user \ --disable-vhost-net \ --disable-virtfs \ - --disable-vnc \ - --enable-tools + --disable-vnc +.endif +.if ${FLAVOR:U} == tools +CONFIGURE_ARGS+= --enable-tools .endif CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} @@ -116,7 +129,7 @@ OPTIONS_SINGLE_NCURSES= NCURSES_BASE NCURSES_DEFAULT NCURSES_PORT .if ${FLAVOR:U} == nox11 OPTIONS_EXCLUDE:= GTK3 X11 .endif -.if ${FLAVOR:U} == tools +.if ${FLAVOR:U} == tools || ${FLAVOR:U} == guestagent OPTIONS_EXCLUDE:= CAPSTONE CDROM_DMA CURL DEBUG GNUTLS GTK3 ISCSI \ JPEG NCURSES NCURSES_BASE NCURSES_DEFAULT \ NCURSES_PORT OPENGL PNG SAMBA SASL STATIC_LINK \ @@ -233,7 +246,7 @@ do-install: .if !target(post-install) post-install: -.if ${FLAVOR:U} != tools +.if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc .endif diff --git a/emulators/qemu/files/qemu-guest-agent.in b/emulators/qemu/files/qemu-guest-agent.in new file mode 100644 index 000000000000..158666dbbc31 --- /dev/null +++ b/emulators/qemu/files/qemu-guest-agent.in @@ -0,0 +1,31 @@ +#!/bin/sh +# +# PROVIDE: qemu_guest_agent +# REQUIRE: DAEMON +# KEYWORD: nojail +# + +# +# Add the following lines to /etc/rc.conf to enable qemu-guest-agent: +# +#qemu_guest_agent_enable="YES" +# +# For detailed logging add flags -v and -l to /etc/rc.conf +# +#qemu_guest_agent_flags="-d -v -l /var/log/qemu-ga.log" + +. /etc/rc.subr + +name=qemu_guest_agent +rcvar=qemu_guest_agent_enable + +load_rc_config $name + +qemu_guest_agent_flags=${qemu_guest_agent_flags-"-d"} +qemu_guest_agent_enable=${qemu_guest_agent_enable:-"NO"} + +qemu_guest_agent_bin=/usr/local/bin/qemu-ga +command=${qemu_guest_agent_bin} +pidfile="/var/run/qemu-ga.pid" + +run_rc_command "$1" diff --git a/emulators/qemu/pkg-descr-ga b/emulators/qemu/pkg-descr-ga new file mode 100644 index 000000000000..c796dce46669 --- /dev/null +++ b/emulators/qemu/pkg-descr-ga @@ -0,0 +1,11 @@ +The QEMU Guest Agent is a daemon intended to be run within virtual machines. +It allows the hypervisor host to perform various operations in the guest, +such as: + +* get information from the guest +* set the guest’s system time +* read/write a file +* sync and freeze the filesystems +* suspend the guest +* reconfigure guest local processors +* set user’s password diff --git a/emulators/qemu/pkg-plist-ga b/emulators/qemu/pkg-plist-ga new file mode 100644 index 000000000000..fb23343352ea --- /dev/null +++ b/emulators/qemu/pkg-plist-ga @@ -0,0 +1,43 @@ +bin/qemu-ga +include/qemu-plugin.h +man/man1/qemu.1.gz +man/man7/qemu-block-drivers.7.gz +man/man7/qemu-cpu-models.7.gz +man/man7/qemu-ga-ref.7.gz +man/man7/qemu-qmp-ref.7.gz +man/man8/qemu-ga.8.gz +%%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%%/trace-events-all