From nobody Wed Nov 17 11:35:56 2021 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 87092189CE80; Wed, 17 Nov 2021 11:35:56 +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 4HvLTm3Ppyz4nDH; Wed, 17 Nov 2021 11:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 556B220412; Wed, 17 Nov 2021 11:35: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 1AHBZuvp053884; Wed, 17 Nov 2021 11:35:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AHBZueD053883; Wed, 17 Nov 2021 11:35:56 GMT (envelope-from git) Date: Wed, 17 Nov 2021 11:35:56 GMT Message-Id: <202111171135.1AHBZueD053883@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 7dfdaaf205c9 - main - emulators/qemu5: UNBREAK by fix missing patches 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7dfdaaf205c9dd859f1d9ffd8d30b166c99e62ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=7dfdaaf205c9dd859f1d9ffd8d30b166c99e62ed commit 7dfdaaf205c9dd859f1d9ffd8d30b166c99e62ed Author: Muhammad Moinur Rahman AuthorDate: 2021-11-17 11:34:34 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-11-17 11:35:43 +0000 emulators/qemu5: UNBREAK by fix missing patches Reported by: olgeni --- emulators/qemu5/files/patch-Makefile | 45 ---------------------- .../files/patch-docs_system_qemu-cpu-models.rst | 8 ++++ 2 files changed, 8 insertions(+), 45 deletions(-) diff --git a/emulators/qemu5/files/patch-Makefile b/emulators/qemu5/files/patch-Makefile deleted file mode 100644 index abddaa8e630f..000000000000 --- a/emulators/qemu5/files/patch-Makefile +++ /dev/null @@ -1,45 +0,0 @@ ---- Makefile.orig 2020-04-28 16:49:25 UTC -+++ Makefile -@@ -362,6 +362,10 @@ 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+=$(MANUAL_BUILDDIR)/system/qemu.1 - DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-img.1 - DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-nbd.8 -@@ -369,6 +373,7 @@ DOCS+=$(MANUAL_BUILDDIR)/interop/qemu-ga.8 - ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) - DOCS+=$(MANUAL_BUILDDIR)/tools/virtiofsd.1 - endif -+endif - DOCS+=$(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 - 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 -@@ -878,10 +883,12 @@ install-sphinxdocs: sphinxdocs - $(call install-manual,user) - - install-doc: $(DOCS) install-sphinxdocs -+ifndef NOPORTDOCS - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/index.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" -+endif - ifdef CONFIG_POSIX - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man1" -@@ -899,8 +906,10 @@ ifdef CONFIG_TRACE_SYSTEMTAP - endif - ifneq (,$(findstring qemu-ga,$(TOOLS))) - $(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)" -+endif - $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" - endif - endif diff --git a/emulators/qemu5/files/patch-docs_system_qemu-cpu-models.rst b/emulators/qemu5/files/patch-docs_system_qemu-cpu-models.rst new file mode 100644 index 000000000000..ed263998422e --- /dev/null +++ b/emulators/qemu5/files/patch-docs_system_qemu-cpu-models.rst @@ -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.