Skip to contentSkip to conversation

MANY errors while building media docbooks

PATCH In review Randy Dunlap 2 participants 4 messages Jun 16, 2014 – Jun 18, 2014

Subsystems (3)
Documentation Media (V4L/DVB) Kbuild
lore
Share & tools
lore

Randy Dunlap

author reviewer
#0 lore raw

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

Signature · 1 line
~Randy
#1 lore raw
Quoted 11 lines · Randy Dunlap

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

#2 lore raw

PATCH 1/1 Documentation: Fix DocBook build with relative $(srctree)

In reply to Randy Dunlap

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 <[email protected]>
Signed-off-by Michal Marek <[email protected]>
---
 Documentation/DocBook/media/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/DocBook/media/Makefile +2 -2
index 1d27f0a..639e748 100644
@@ -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)
Signature · 1 line
1.9.2
author reviewer Acked-by Tested-by on v1 1/1
#3 lore raw

Re: [PATCH] Documentation: Fix DocBook build with relative $(srctree)

Quoted 9 lines · Michal Marek

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 <[email protected]>
Signed-off-by Michal Marek <[email protected]>

Thanks.

Acked-by Randy Dunlap <[email protected]>
Tested-by Randy Dunlap <[email protected]>

Please merge to Linus sooner instead of later.

Quoted 20 lines
---
 Documentation/DocBook/media/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/DocBook/media/Makefile +2 -2
index 1d27f0a..639e748 100644
@@ -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)
Signature · 1 line
~Randy