[PATCH] Makefile: add missing mkdir MANUAL_BUILDDIR

Stefan Hajnoczi posted 1 patch 4 years, 3 months ago
Test FreeBSD passed
Test docker-mingw@fedora passed
Test checkpatch passed
Test docker-quick@centos7 passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200120163400.603449-1-stefanha@redhat.com
Makefile | 1 +
1 file changed, 1 insertion(+)
[PATCH] Makefile: add missing mkdir MANUAL_BUILDDIR
Posted by Stefan Hajnoczi 4 years, 3 months ago
The MANUAL_BUILDDIR directory is automatically created by sphinx-build
for the other targets.  The index.html target does not use sphinx-build
so we must manually create the directory to avoid the following error:

  GEN     docs/built/index.html
  /bin/sh: docs/built/index.html: No such file or directory

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index afa5cb6548..6562b0dc97 100644
--- a/Makefile
+++ b/Makefile
@@ -1022,6 +1022,7 @@ $(MANUAL_BUILDDIR)/interop/qemu-ga.8: $(call manual-deps,interop)
 	$(call build-manual,interop,man)
 
 $(MANUAL_BUILDDIR)/index.html: $(SRC_PATH)/docs/index.html.in qemu-version.h
+	@mkdir -p "$(MANUAL_BUILDDIR)"
 	$(call quiet-command, sed "s|@@VERSION@@|${VERSION}|g" $< >$@, \
              "GEN","$@")
 
-- 
2.24.1


Re: [PATCH] Makefile: add missing mkdir MANUAL_BUILDDIR
Posted by Miroslav Rezanina 4 years, 3 months ago
On Mon, Jan 20, 2020 at 04:34:00PM +0000, Stefan Hajnoczi wrote:
> The MANUAL_BUILDDIR directory is automatically created by sphinx-build
> for the other targets.  The index.html target does not use sphinx-build
> so we must manually create the directory to avoid the following error:
> 
>   GEN     docs/built/index.html
>   /bin/sh: docs/built/index.html: No such file or directory
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  Makefile | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Makefile b/Makefile
> index afa5cb6548..6562b0dc97 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1022,6 +1022,7 @@ $(MANUAL_BUILDDIR)/interop/qemu-ga.8: $(call manual-deps,interop)
>  	$(call build-manual,interop,man)
>  
>  $(MANUAL_BUILDDIR)/index.html: $(SRC_PATH)/docs/index.html.in qemu-version.h
> +	@mkdir -p "$(MANUAL_BUILDDIR)"
>  	$(call quiet-command, sed "s|@@VERSION@@|${VERSION}|g" $< >$@, \
>               "GEN","$@")
>  
> -- 
> 2.24.1
> 

Fixing our issues with build,

Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>

Re: [PATCH] Makefile: add missing mkdir MANUAL_BUILDDIR
Posted by Peter Maydell 4 years, 3 months ago
On Tue, 21 Jan 2020 at 11:06, Miroslav Rezanina <mrezanin@redhat.com> wrote:
>
> On Mon, Jan 20, 2020 at 04:34:00PM +0000, Stefan Hajnoczi wrote:
> > The MANUAL_BUILDDIR directory is automatically created by sphinx-build
> > for the other targets.  The index.html target does not use sphinx-build
> > so we must manually create the directory to avoid the following error:
> >
> >   GEN     docs/built/index.html
> >   /bin/sh: docs/built/index.html: No such file or directory
> >
> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > ---
> >  Makefile | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/Makefile b/Makefile
> > index afa5cb6548..6562b0dc97 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1022,6 +1022,7 @@ $(MANUAL_BUILDDIR)/interop/qemu-ga.8: $(call manual-deps,interop)
> >       $(call build-manual,interop,man)
> >
> >  $(MANUAL_BUILDDIR)/index.html: $(SRC_PATH)/docs/index.html.in qemu-version.h
> > +     @mkdir -p "$(MANUAL_BUILDDIR)"
> >       $(call quiet-command, sed "s|@@VERSION@@|${VERSION}|g" $< >$@, \
> >               "GEN","$@")
> >
> > --
> > 2.24.1
> >
>
> Fixing our issues with build,
>
> Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>

Thanks; applied to master as a build-fix.

-- PMM