Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Nov 2021 11:35:56 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7dfdaaf205c9 - main - emulators/qemu5: UNBREAK by fix missing patches
Message-ID:  <202111171135.1AHBZueD053883@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7dfdaaf205c9dd859f1d9ffd8d30b166c99e62ed

commit 7dfdaaf205c9dd859f1d9ffd8d30b166c99e62ed
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2021-11-17 11:34:34 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
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.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111171135.1AHBZueD053883>