Attachment 217299 Details for Bug 230204 – patch for 4.2.1

[patch] patch for 4.2.1

qemu_421_noportdocs.diff (text/plain), 1.76 KB, created by Roman Bogorodskiy on 2020-08-18 08:27:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Bogorodskiy

Created: 2020-08-18 08:27:13 UTC

Size: 1.76 KB

patch

obsolete

>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 545086)
>+++ files/patch-Makefile	(working copy)
>@@ -1,4 +1,4 @@
>---- Makefile.orig	2019-12-12 18:20:47 UTC
>+--- Makefile.orig	2020-06-25 18:12:16 UTC
> +++ Makefile
> @@ -342,9 +342,14 @@ MANUAL_BUILDDIR := docs
>  endif
>@@ -5,7 +5,7 @@
>  
>  ifdef BUILD_DOCS
> +ifdef NOPORTDOCS
>-+DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
>++DOCS=qemu.1 qemu-img.1 qemu-nbd.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 $(MANUAL_BUILDDIR)/interop/qemu-ga.8
>@@ -29,11 +29,13 @@
>  ifdef CONFIG_POSIX
>  	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
>  	$(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
>-@@ -841,8 +848,10 @@ ifdef CONFIG_TRACE_SYSTEMTAP
>+@@ -839,10 +846,12 @@ endif
>+ ifdef CONFIG_TRACE_SYSTEMTAP
>+ 	$(INSTALL_DATA) scripts/qemu-trace-stap.1 "$(DESTDIR)$(mandir)/man1"
>  endif
>++ifndef NOPORTDOCS
>  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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 545086)
>+++ pkg-plist	(working copy)
>@@ -44,9 +44,9 @@
> man/man1/qemu-img.1.gz
> man/man7/qemu-block-drivers.7.gz
> man/man7/qemu-cpu-models.7.gz
>-man/man7/qemu-ga-ref.7.gz
>+%%PORTDOCS%%man/man7/qemu-ga-ref.7.gz
> man/man7/qemu-qmp-ref.7.gz
>-man/man8/qemu-ga.8.gz
>+%%PORTDOCS%%man/man8/qemu-ga.8.gz
> man/man8/qemu-nbd.8.gz
> @sample etc/qemu-ifup.sample
> @sample etc/qemu-ifdown.sample

Actions: View | Diff

Attachments on bug 230204: 196669 | 198948 | 217299 | 217314