[PATCH 1/4] samples/kdbus: drop wrong include

[PATCH 1/4] samples/kdbus: drop wrong include

[David Herrmann]

There is no reason to use ./include/uapi/ directly from samples. If your
system headers are not up-to-date, you _need_ to run "make
headers-install" (which will install them to ./usr/ in your kernel tree)
before building the examples. Otherwise, you will get warnings and build
failures.

Once ./usr/ is updated with the correct headers, it contains everything we
need, so drop -Iinclude/uapi from the kdbus-workers CFLAGS.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
---
 samples/kdbus/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/samples/kdbus/Makefile b/samples/kdbus/Makefile
index eee9b9a..e714602 100644
--- a/samples/kdbus/Makefile
+++ b/samples/kdbus/Makefile
@@ -5,7 +5,5 @@ hostprogs-y += kdbus-workers
 
 always := $(hostprogs-y)
 
-HOSTCFLAGS_kdbus-workers.o +=		\
-	-I$(objtree)/usr/include/	\
-	-I$(objtree)/include/uapi/
+HOSTCFLAGS_kdbus-workers.o += -I$(objtree)/usr/include
 HOSTLOADLIBES_kdbus-workers := -lrt
-- 
2.3.2

[PATCH 2/4] Documentation/kdbus: fix out-of-tree builds

[David Herrmann]

Don't use $(obj) to access source files, but use $(srctree)/$(src)/
instead. This fixes build issues if you use O= with a directory other than
the source directory.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
---
 Documentation/kdbus/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/kdbus/Makefile b/Documentation/kdbus/Makefile
index f6d4912..d8e6bf3 100644
--- a/Documentation/kdbus/Makefile
+++ b/Documentation/kdbus/Makefile
@@ -15,7 +15,7 @@ XMLFILES := $(addprefix $(obj)/,$(DOCS))
 MANFILES := $(patsubst %.xml, %.7, $(XMLFILES))
 HTMLFILES := $(patsubst %.xml, %.html, $(XMLFILES))
 
-XMLTO_ARGS := -m $(obj)/stylesheet.xsl
+XMLTO_ARGS := -m $(srctree)/$(src)/stylesheet.xsl
 
 %.7: %.xml
 	xmlto man $(XMLTO_ARGS) -o $(obj) $<
-- 
2.3.2

[PATCH 3/4] Documentation/kdbus: support quiet builds

[David Herrmann]

Add support for quiet builds, just like Documentation/DocBook/Makefile
supports.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
---
 Documentation/kdbus/Makefile | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Documentation/kdbus/Makefile b/Documentation/kdbus/Makefile
index d8e6bf3..af87641 100644
--- a/Documentation/kdbus/Makefile
+++ b/Documentation/kdbus/Makefile
@@ -15,13 +15,23 @@ XMLFILES := $(addprefix $(obj)/,$(DOCS))
 MANFILES := $(patsubst %.xml, %.7, $(XMLFILES))
 HTMLFILES := $(patsubst %.xml, %.html, $(XMLFILES))
 
-XMLTO_ARGS := -m $(srctree)/$(src)/stylesheet.xsl
+XMLTO_ARGS := -m $(srctree)/$(src)/stylesheet.xsl --skip-validation
 
+quiet_cmd_db2man = MAN     $@
+      cmd_db2man = xmlto man $(XMLTO_ARGS) -o $(obj) $<
 %.7: %.xml
-	xmlto man $(XMLTO_ARGS) -o $(obj) $<
+	@(which xmlto > /dev/null 2>&1) || \
+	 (echo "*** You need to install xmlto ***"; \
+	  exit 1)
+	$(call cmd,db2man)
 
+quiet_cmd_db2html = HTML    $@
+      cmd_db2html = xmlto html-nochunks $(XMLTO_ARGS) -o $(obj) $<
 %.html: %.xml
-	xmlto html-nochunks $(XMLTO_ARGS) -o $(obj) $<
+	@(which xmlto > /dev/null 2>&1) || \
+	 (echo "*** You need to install xmlto ***"; \
+	  exit 1)
+	$(call cmd,db2html)
 
 mandocs: $(MANFILES)
 
-- 
2.3.2

[PATCH 4/4] selftests/kdbus: fix gitignore

[David Herrmann]

Drop unused elements from .gitignore (which are leftovers when
documentation was placed in the same directory).
Add "kdbus-test" to .gitignore, which is the test binary of all kdbus
selftests.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
---
 tools/testing/selftests/kdbus/.gitignore | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/testing/selftests/kdbus/.gitignore b/tools/testing/selftests/kdbus/.gitignore
index 7b421f7..d3ef42f 100644
--- a/tools/testing/selftests/kdbus/.gitignore
+++ b/tools/testing/selftests/kdbus/.gitignore
@@ -1,3 +1 @@
-*.7
-manpage.*
-*.proc
+kdbus-test
-- 
2.3.2

Re: [PATCH 1/4] samples/kdbus: drop wrong include

[Greg KH]

On Mon, Mar 16, 2015 at 10:17:10AM +0100, David Herrmann wrote:
> There is no reason to use ./include/uapi/ directly from samples. If your
> system headers are not up-to-date, you _need_ to run "make
> headers-install" (which will install them to ./usr/ in your kernel tree)
> before building the examples. Otherwise, you will get warnings and build
> failures.
> 
> Once ./usr/ is updated with the correct headers, it contains everything we
> need, so drop -Iinclude/uapi from the kdbus-workers CFLAGS.
> 
> Signed-off-by: David Herrmann <dh.herrmann@gmail.com>

All 4 patches now applied, thanks.

greg k-h