Skip to contentSkip to conversation

manual: add requirements for graph generation

PATCH New Fabio Porcedda 3 participants 6 messages Jun 17, 2014 – Jun 22, 2014 Kbuild

lore
Share & tools
lore

Fabio Porcedda

author
#0 lore raw

PATCH 1/2 manual: add requirements for graph generation

Add "graphviz" and "python-matplotlib" as requirements for graph generation.

Signed-off-by Fabio Porcedda <[email protected]>
Reported-by Dallas Clement <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Yann E. MORIN <[email protected]>

---

Notes:
v2:
- specify that "graphviz" is needed only for graph-depends (Yann)

 docs/manual/prerequisite.txt | 4 ++++
 1 file changed, 4 insertions(+)
docs/manual/prerequisite.txt +4 -0
index c5d5442..30970d2 100644
@@ -77,3 +77,7 @@ development context (further details: refer to xref:download-infra[]).
 ** +w3m+
 ** +python+ with the +argparse+ module (automatically present in 2.7+ and 3.2+)
 ** +dblatex+ (required for the pdf manual only)
+
+* Graph generation tools:
+** +graphviz+ to use 'graph-depends' and '<pkg>-graph-depends'
+** +python-matplotlib+ to use 'graph-build'
Signature · 1 line
2.0.0
author
#1 lore raw

PATCH 2/2 Makefile: test if "dot" exists in "<pkg>-graph-depends"

To be able to check the "dot" command availability in "<pkg>-graph-depends" move the check to the "graph-depends-requirements" rule. Also don't use a subshell for the exit command to be sure that the error will be returned by the shell.

Signed-off-by Fabio Porcedda <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Yann E. MORIN <[email protected]>

---

Notes:
v2:
- Remove the check for graph-build (Yann and Thomas)
- Remove the previuous code for checking the "dot" command avaiability (Yann)
- Don't use a subshell (Yann)

 Makefile               | 6 ++++--
 package/pkg-generic.mk | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
Makefile +4 -2
index 86acbbf..a27502b 100644
@@ -669,9 +669,11 @@ graph-build: $(O)/build/build-time.log
 				   --output=$(O)/graphs/build.pie-$(t).$(BR_GRAPH_OUT) \
 				   $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep))
 
-graph-depends:
+graph-depends-requirements:
 	@dot -? >/dev/null 2>&1 || \
-		(echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1)
+		{ echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1; }
+
+graph-depends: graph-depends-requirements
 	@$(INSTALL) -d $(O)/graphs
 	@cd "$(CONFIG_DIR)"; \
 	$(TOPDIR)/support/scripts/graph-depends $(BR2_GRAPH_DEPS_OPTS) \
package/pkg-generic.mk +1 -1
index 457d873..4a011cc 100644
@@ -556,7 +556,7 @@ endif
 $(1)-show-depends:
 			@echo $$($(2)_FINAL_DEPENDENCIES)
 
-$(1)-graph-depends:
+$(1)-graph-depends: graph-depends-requirements
 			@$$(INSTALL) -d $$(O)/graphs
 			@cd "$$(CONFIG_DIR)"; \
 			$$(TOPDIR)/support/scripts/graph-depends -p $(1) $$(BR2_GRAPH_DEPS_OPTS) \
Signature · 1 line
2.0.0
#2 lore raw

PATCH 2/2 Makefile: test if "dot" exists in "<pkg>-graph-depends"

Fabio, All,

On 2014-06-17 11:33 +0200, Fabio Porcedda spake thusly:

Quoted 8 lines

To be able to check the "dot" command availability in "<pkg>-graph-depends" move the check to the "graph-depends-requirements" rule. Also don't use a subshell for the exit command to be sure that the error will be returned by the shell.

Signed-off-by Fabio Porcedda <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Yann E. MORIN <[email protected]>
Tested-by "Yann E. MORIN" <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 47 lines

---

Notes:
v2:
- Remove the check for graph-build (Yann and Thomas)
- Remove the previuous code for checking the "dot" command avaiability (Yann)
- Don't use a subshell (Yann)

 Makefile               | 6 ++++--
 package/pkg-generic.mk | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
Makefile +4 -2
index 86acbbf..a27502b 100644
@@ -669,9 +669,11 @@ graph-build: $(O)/build/build-time.log
 				   --output=$(O)/graphs/build.pie-$(t).$(BR_GRAPH_OUT) \
 				   $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep))
 
-graph-depends:
+graph-depends-requirements:
 	@dot -? >/dev/null 2>&1 || \
-		(echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1)
+		{ echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1; }
+
+graph-depends: graph-depends-requirements
 	@$(INSTALL) -d $(O)/graphs
 	@cd "$(CONFIG_DIR)"; \
 	$(TOPDIR)/support/scripts/graph-depends $(BR2_GRAPH_DEPS_OPTS) \
package/pkg-generic.mk +1 -1
index 457d873..4a011cc 100644
@@ -556,7 +556,7 @@ endif
 $(1)-show-depends:
 			@echo $$($(2)_FINAL_DEPENDENCIES)
 
-$(1)-graph-depends:
+$(1)-graph-depends: graph-depends-requirements
 			@$$(INSTALL) -d $$(O)/graphs
 			@cd "$$(CONFIG_DIR)"; \
 			$$(TOPDIR)/support/scripts/graph-depends -p $(1) $$(BR2_GRAPH_DEPS_OPTS) \
Signature · 1 line
2.0.0
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#3 lore raw

PATCH 2/2 Makefile: test if "dot" exists in "<pkg>-graph-depends"

In reply to Fabio Porcedda

Dear Fabio Porcedda,

Quoted 8 lines · Fabio Porcedda

To be able to check the "dot" command availability in "<pkg>-graph-depends" move the check to the "graph-depends-requirements" rule. Also don't use a subshell for the exit command to be sure that the error will be returned by the shell.

Signed-off-by Fabio Porcedda <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Yann E. MORIN <[email protected]>

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH 1/2 manual: add requirements for graph generation

In reply to Fabio Porcedda

Fabio, All,

On 2014-06-17 11:33 +0200, Fabio Porcedda spake thusly:

Quoted 7 lines

Add "graphviz" and "python-matplotlib" as requirements for graph generation.

Signed-off-by Fabio Porcedda <[email protected]>
Reported-by Dallas Clement <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Yann E. MORIN <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 24 lines

---

Notes:
v2:
- specify that "graphviz" is needed only for graph-depends (Yann)

 docs/manual/prerequisite.txt | 4 ++++
 1 file changed, 4 insertions(+)
docs/manual/prerequisite.txt +4 -0
index c5d5442..30970d2 100644
@@ -77,3 +77,7 @@ development context (further details: refer to xref:download-infra[]).
 ** +w3m+
 ** +python+ with the +argparse+ module (automatically present in 2.7+ and 3.2+)
 ** +dblatex+ (required for the pdf manual only)
+
+* Graph generation tools:
+** +graphviz+ to use 'graph-depends' and '<pkg>-graph-depends'
+** +python-matplotlib+ to use 'graph-build'
Signature · 1 line
2.0.0
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#5 lore raw

PATCH 1/2 manual: add requirements for graph generation

In reply to Fabio Porcedda

Dear Fabio Porcedda,

Quoted 7 lines · Fabio Porcedda

Add "graphviz" and "python-matplotlib" as requirements for graph generation.

Signed-off-by Fabio Porcedda <[email protected]>
Reported-by Dallas Clement <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Yann E. MORIN <[email protected]>

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com