* MANY errors while building media docbooks
@ 2014-06-16 17:28 Randy Dunlap
2014-06-17 15:32 ` Michal Marek
2014-06-18 15:27 ` [PATCH] Documentation: Fix DocBook build with relative $(srctree) Michal Marek
0 siblings, 2 replies; 4+ messages in thread
From: Randy Dunlap @ 2014-06-16 17:28 UTC (permalink / raw)
To: linux-kbuild, LKML, Michal Marek; +Cc: linux-media
on Linux v3.16-rc1, building docbooks to a separate build directory
(mkdir DOC; make O=DOC htmldocs) gives me more than 12,000 lines like this:
grep: ./Documentation/DocBook//vidioc-subdev-g-fmt.xml: No such file or directory
grep: ./Documentation/DocBook//vidioc-subdev-g-frame-interval.xml: No such file or directory
grep: ./Documentation/DocBook//vidioc-subdev-g-selection.xml: No such file or directory
grep: ./Documentation/DocBook//vidioc-subscribe-event.xml: No such file or directory
grep: ./Documentation/DocBook//media-ioc-device-info.xml: No such file or directory
grep: ./Documentation/DocBook//media-ioc-enum-entities.xml: No such file or directory
grep: ./Documentation/DocBook//media-ioc-enum-links.xml: No such file or directory
grep: ./Documentation/DocBook//media-ioc-setup-link.xml: No such file or directory
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: MANY errors while building media docbooks
2014-06-16 17:28 MANY errors while building media docbooks Randy Dunlap
@ 2014-06-17 15:32 ` Michal Marek
2014-06-18 15:27 ` [PATCH] Documentation: Fix DocBook build with relative $(srctree) Michal Marek
1 sibling, 0 replies; 4+ messages in thread
From: Michal Marek @ 2014-06-17 15:32 UTC (permalink / raw)
To: Randy Dunlap, linux-kbuild, LKML; +Cc: linux-media
On 2014-06-16 19:28, Randy Dunlap wrote:
> on Linux v3.16-rc1, building docbooks to a separate build directory
> (mkdir DOC; make O=DOC htmldocs) gives me more than 12,000 lines like this:
>
> grep: ./Documentation/DocBook//vidioc-subdev-g-fmt.xml: No such file or directory
> grep: ./Documentation/DocBook//vidioc-subdev-g-frame-interval.xml: No such file or directory
> grep: ./Documentation/DocBook//vidioc-subdev-g-selection.xml: No such file or directory
> grep: ./Documentation/DocBook//vidioc-subscribe-event.xml: No such file or directory
> grep: ./Documentation/DocBook//media-ioc-device-info.xml: No such file or directory
> grep: ./Documentation/DocBook//media-ioc-enum-entities.xml: No such file or directory
> grep: ./Documentation/DocBook//media-ioc-enum-links.xml: No such file or directory
> grep: ./Documentation/DocBook//media-ioc-setup-link.xml: No such file or directory
Seems to be another fallout of the relative path patches, I'll have a look.
Thanks,
Michal
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Documentation: Fix DocBook build with relative $(srctree)
2014-06-16 17:28 MANY errors while building media docbooks Randy Dunlap
2014-06-17 15:32 ` Michal Marek
@ 2014-06-18 15:27 ` Michal Marek
2014-06-18 16:12 ` Randy Dunlap
1 sibling, 1 reply; 4+ messages in thread
From: Michal Marek @ 2014-06-18 15:27 UTC (permalink / raw)
To: Randy Dunlap; +Cc: linux-kernel, linux-kbuild, linux-media
After commits 890676c6 (kbuild: Use relative path when building in the source
tree) and 9da0763b (kbuild: Use relative path when building in a subdir
of the source tree), the $(srctree) variable can be a relative path.
This breaks Documentation/DocBook/media/Makefile, because it tries to
create symlinks from a subdirectory of the object tree to the source
tree. Fix this by using a full path in this case.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---
Documentation/DocBook/media/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
index 1d27f0a..639e748 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -202,8 +202,8 @@ $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
$(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES)
@$($(quiet)gen_xml)
- @(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/)
- @(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/)
+ @(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/v4l/*xml $(MEDIA_OBJ_DIR)/)
+ @(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/dvb/*xml $(MEDIA_OBJ_DIR)/)
$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml
@$($(quiet)gen_xml)
--
1.9.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Documentation: Fix DocBook build with relative $(srctree)
2014-06-18 15:27 ` [PATCH] Documentation: Fix DocBook build with relative $(srctree) Michal Marek
@ 2014-06-18 16:12 ` Randy Dunlap
0 siblings, 0 replies; 4+ messages in thread
From: Randy Dunlap @ 2014-06-18 16:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kernel, linux-kbuild, linux-media
On 06/18/14 08:27, Michal Marek wrote:
> After commits 890676c6 (kbuild: Use relative path when building in the source
> tree) and 9da0763b (kbuild: Use relative path when building in a subdir
> of the source tree), the $(srctree) variable can be a relative path.
> This breaks Documentation/DocBook/media/Makefile, because it tries to
> create symlinks from a subdirectory of the object tree to the source
> tree. Fix this by using a full path in this case.
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Michal Marek <mmarek@suse.cz>
Thanks.
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Please merge to Linus sooner instead of later.
> ---
> Documentation/DocBook/media/Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
> index 1d27f0a..639e748 100644
> --- a/Documentation/DocBook/media/Makefile
> +++ b/Documentation/DocBook/media/Makefile
> @@ -202,8 +202,8 @@ $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
>
> $(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES)
> @$($(quiet)gen_xml)
> - @(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/)
> - @(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/)
> + @(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/v4l/*xml $(MEDIA_OBJ_DIR)/)
> + @(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/dvb/*xml $(MEDIA_OBJ_DIR)/)
>
> $(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml
> @$($(quiet)gen_xml)
>
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-06-18 16:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-16 17:28 MANY errors while building media docbooks Randy Dunlap
2014-06-17 15:32 ` Michal Marek
2014-06-18 15:27 ` [PATCH] Documentation: Fix DocBook build with relative $(srctree) Michal Marek
2014-06-18 16:12 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).