Skip to contentSkip to conversation

doc/manual: fix generating manual after legacy overhaul

PATCH New Yann E. MORIN 2 participants 3 messages May 1, 2015

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/1 doc/manual: fix generating manual after legacy overhaul

Commit 53903a15 (*config: improve handling of BR2_LEGACY) added an option to entirely skip legacy entries, by passing a variable in the environment.

Howerver, it mised one location where that variable is also needed, which is generating the list of packages and deprecated features for inclusion in the manual.

Fix that by re-using the global $(COMMON_CONFIG_ENV) variable, overriding just what we don't want (i.e. br2-external location and defconfig path).

Also, slightly re-order variables so the ones we override come right after the common settings, moving the specific pnes at the end.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
---
 docs/manual/manual.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
docs/manual/manual.mk +3 -1
index d5db2c2..2755582 100644
@@ -12,8 +12,10 @@ MANUAL_RESOURCES = $(TOPDIR)/docs/images
 # should not be included in the manual.
 define MANUAL_GEN_LISTS
 	$(Q)$(call MESSAGE,"Updating the manual lists...")
-	$(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(@D) \
+	$(Q)$(COMMON_CONFIG_ENV) \
+		BR2_DEFCONFIG="" \
 		BR2_EXTERNAL=$(TOPDIR)/support/dummy-external \
+		TOPDIR=$(TOPDIR) O=$(@D) \
 		python -B $(TOPDIR)/support/scripts/gen-manual-lists.py
 endef
 MANUAL_POST_RSYNC_HOOKS += MANUAL_GEN_LISTS
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 doc/manual: fix generating manual after legacy overhaul

Quoted 5 lines · Yann E. MORIN

Commit 53903a15 (*config: improve handling of BR2_LEGACY) added an option to entirely skip legacy entries, by passing a variable in the environment.

Howerver, it mised one location where that variable is also needed,

However missed

Quoted 9 lines

which is generating the list of packages and deprecated features for inclusion in the manual.

Fix that by re-using the global $(COMMON_CONFIG_ENV) variable, overriding just what we don't want (i.e. br2-external location and defconfig path).

Also, slightly re-order variables so the ones we override come right after the common settings, moving the specific pnes at the end.

ones

And split into one variable per line.

Quoted 12 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
---
 docs/manual/manual.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
docs/manual/manual.mk +0 -0
index d5db2c2..2755582 100644

docs/manual/manual.mk MANUAL_RESOURCES = $(TOPDIR)/docs/images · line 18

Quoted 8 lines
docs/manual/manual.mk +3 -1
@@ -12,8 +12,10 @@ MANUAL_RESOURCES = $(TOPDIR)/docs/images
 # should not be included in the manual.
 define MANUAL_GEN_LISTS
 	$(Q)$(call MESSAGE,"Updating the manual lists...")
-	$(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(@D) \
+	$(Q)$(COMMON_CONFIG_ENV) \
+		BR2_DEFCONFIG="" \
 		BR2_EXTERNAL=$(TOPDIR)/support/dummy-external \
+		TOPDIR=$(TOPDIR) O=$(@D) \

Except here you put two variables on a single line...

Regards,
Arnout

Otherwise:

Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Tested-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 4 lines
docs/manual/manual.mk +0 -0
 		python -B $(TOPDIR)/support/scripts/gen-manual-lists.py
 endef
 MANUAL_POST_RSYNC_HOOKS += MANUAL_GEN_LISTS
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
author
#2 lore raw

PATCH 1/1 doc/manual: fix generating manual after legacy overhaul

Arnout, All,

On 2015-05-01 17:54 +0200, Arnout Vandecappelle spake thusly:

Quoted 1 line · Yann E. MORIN

[--SNIP--]

Quoted 5 lines
Quoted 2 lines

Also, slightly re-order variables so the ones we override come right after the common settings, moving the specific pnes at the end.

ones

And split into one variable per line.

No, I did not want to explicitly set one variable per line.

The fact that BR2_DEFCONFIG and BR2_EXTERNAL are on their own line each is just becasue the line would be more than 80-char wide otherwise.

But if you prefer I put a single vazriable per line, I'm OK with that; I also prefer a single variable per line.

Quoted 6 lines
Quoted 6 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
---
 docs/manual/manual.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 15 lines

docs/manual/manual.mk MANUAL_RESOURCES = $(TOPDIR)/docs/images · line 18

Quoted 13 lines
docs/manual/manual.mk +3 -1
index d5db2c2..2755582 100644
@@ -12,8 +12,10 @@ MANUAL_RESOURCES = $(TOPDIR)/docs/images
 # should not be included in the manual.
 define MANUAL_GEN_LISTS
 	$(Q)$(call MESSAGE,"Updating the manual lists...")
-	$(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(@D) \
+	$(Q)$(COMMON_CONFIG_ENV) \
+		BR2_DEFCONFIG="" \
 		BR2_EXTERNAL=$(TOPDIR)/support/dummy-external \
+		TOPDIR=$(TOPDIR) O=$(@D) \

Except here you put two variables on a single line...

Because that was not the goal! ;-)

But I'll change.

Thanks! :-)

Regards,
Yann E. MORIN.

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.  |
'------------------------------^-------^------------------^--------------------'