[Buildroot] [PATCH v2 0/3] Cleanup post-* loops

[Buildroot] [PATCH v2 0/3] Cleanup post-* loops

[Luca Ceresoli]

This patch series cleans up and makes uniform the implementation of the
post-build, post-image and rootfs-overlay loops. It also makes post-build and
psot-image print each script name before executing it, like the rootfs-overlay
does.

Luca

Changes in v2:
 - use a make foreach instead of a shell for to loop over the entries
   (suggested by Danomi Manchego);
 - rework also the post-image loop (suggested by Thomas Petazzoni).

Luca Ceresoli (3):
  post-build: show each script filename before execution
  post-image: show each script filename before execution
  rootfs-overlay: use a make foreach instead of a shell for

 Makefile |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

-- 
1.7.10.4

[Buildroot] [PATCH v2 1/3] post-build: show each script filename before execution

[Luca Ceresoli]

This also simplifies code by removing the ifneq/endif clauses.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 Makefile |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c95bb1e..75f0f0c 100644
--- a/Makefile
+++ b/Makefile
@@ -509,11 +509,9 @@ endif
 			$${dir}/ $(TARGET_DIR); \
 	done
 
-ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
-	@$(call MESSAGE,"Executing post-build script\(s\)")
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
+		$(call MESSAGE,"Executing  post-build script $(s)"); \
 		$(s) $(TARGET_DIR)$(sep))
-endif
 
 ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
 LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
-- 
1.7.10.4

[Buildroot] [PATCH v2 1/3] post-build: show each script filename before execution

[Yann E. MORIN]

Luca, All,

On Mon, Apr 08, 2013 at 06:50:14PM +0200, Luca Ceresoli wrote:
> This also simplifies code by removing the ifneq/endif clauses.
> 
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

Very usefull, indeed.

Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN

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

[Buildroot] [PATCH v2 1/3] post-build: show each script filename before execution

[Arnout Vandecappelle]

On 08/04/13 18:50, Luca Ceresoli wrote:
> This also simplifies code by removing the ifneq/endif clauses.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> ---
>   Makefile |    4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index c95bb1e..75f0f0c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -509,11 +509,9 @@ endif
>   			$${dir}/ $(TARGET_DIR); \
>   	done
>
> -ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
> -	@$(call MESSAGE,"Executing post-build script\(s\)")
>   	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
> +		$(call MESSAGE,"Executing  post-build script $(s)"); \
>   		$(s) $(TARGET_DIR)$(sep))
> -endif

  I wonder, if there are multiple scripts, won't the second MESSAGE be 
echoed by make? I had expected that the @ would only apply to the first 
line when they are separated with $(sep), and that each invocation would 
run in a separate shell.

  By the way, a very simple alternative would be to remove the @ in front 
of the foreach, then each script invocation will be echoed by make.


  Regards,
  Arnout

>
>   ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
>   LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
>


-- 
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

[Buildroot] [PATCH v2 1/3] post-build: show each script filename before execution

[Yann E. MORIN]

Arnout, Luca, All,

On Wednesday 17 April 2013 18:13:33 Arnout Vandecappelle wrote:
> On 08/04/13 18:50, Luca Ceresoli wrote:
> > This also simplifies code by removing the ifneq/endif clauses.
> >
> > Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> > ---
> >   Makefile |    4 +---
> >   1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index c95bb1e..75f0f0c 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -509,11 +509,9 @@ endif
> >   			$${dir}/ $(TARGET_DIR); \
> >   	done
> >
> > -ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
> > -	@$(call MESSAGE,"Executing post-build script\(s\)")
> >   	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
> > +		$(call MESSAGE,"Executing  post-build script $(s)"); \
> >   		$(s) $(TARGET_DIR)$(sep))
> > -endif
> 
>   I wonder, if there are multiple scripts, won't the second MESSAGE be 
> echoed by make? I had expected that the @ would only apply to the first 
> line when they are separated with $(sep), and that each invocation would 
> run in a separate shell.

Well, it does work as expected: the two scripts I have are
properly echoed with:
>>> Executing  post-build script /blabla/script-1
[traces for script-1]
>>> Executing  post-build script /blabla/script-2
[traces for script-2]

>   By the way, a very simple alternative would be to remove the @ in front 
> of the foreach, then each script invocation will be echoed by make.

Indeed, but I also like the highlighted trace. It makes it easier to spot
the scripts traces.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +0/33 662376056 | Software  Designer | \ / CAMPAIGN     |   ^                |
| --==< O_o >==-- '------------.-------:  X  AGAINST      |  /e\  There is no  |
| http://ymorin.is-a-geek.org/ | (*_*) | / \ HTML MAIL    |  """  conspiracy.  |
'------------------------------'-------'------------------'--------------------'

[Buildroot] [PATCH v2 1/3] post-build: show each script filename before execution

[Peter Korsgaard]

>>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> writes:

 Luca> This also simplifies code by removing the ifneq/endif clauses.
 Luca> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
 Luca> ---
 Luca>  Makefile |    4 +---
 Luca>  1 file changed, 1 insertion(+), 3 deletions(-)

 Luca> diff --git a/Makefile b/Makefile
 Luca> index c95bb1e..75f0f0c 100644
 Luca> --- a/Makefile
 Luca> +++ b/Makefile
 Luca> @@ -509,11 +509,9 @@ endif
 Luca>  			$${dir}/ $(TARGET_DIR); \
 Luca>  	done
 
 Luca> -ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
 Luca> -	@$(call MESSAGE,"Executing post-build script\(s\)")
 Luca>  	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
 Luca> +		$(call MESSAGE,"Executing  post-build script $(s)"); \
 Luca>  		$(s) $(TARGET_DIR)$(sep))

Double space after 'executing'. Committed with that fixed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v2 1/3] post-build: show each script filename before execution

[Luca Ceresoli]

Peter Korsgaard wrote:
>>>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> writes:
>   Luca> This also simplifies code by removing the ifneq/endif clauses.
>   Luca> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>   Luca> ---
>   Luca>  Makefile |    4 +---
>   Luca>  1 file changed, 1 insertion(+), 3 deletions(-)
>
>   Luca> diff --git a/Makefile b/Makefile
>   Luca> index c95bb1e..75f0f0c 100644
>   Luca> --- a/Makefile
>   Luca> +++ b/Makefile
>   Luca> @@ -509,11 +509,9 @@ endif
>   Luca>  			$${dir}/ $(TARGET_DIR); \
>   Luca>  	done
>   
>   Luca> -ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
>   Luca> -	@$(call MESSAGE,"Executing post-build script\(s\)")
>   Luca>  	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
>   Luca> +		$(call MESSAGE,"Executing  post-build script $(s)"); \
>   Luca>  		$(s) $(TARGET_DIR)$(sep))
>
> Double space after 'executing'. Committed with that fixed, thanks.

Ouch, thanks.

Luca

[Buildroot] [PATCH v2 1/3] post-build: show each script filename before execution

[Arnout Vandecappelle]

On 08/04/13 18:50, Luca Ceresoli wrote:
> This also simplifies code by removing the ifneq/endif clauses.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

> ---
>   Makefile |    4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index c95bb1e..75f0f0c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -509,11 +509,9 @@ endif
>   			$${dir}/ $(TARGET_DIR); \
>   	done
>
> -ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
> -	@$(call MESSAGE,"Executing post-build script\(s\)")
>   	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
> +		$(call MESSAGE,"Executing  post-build script $(s)"); \
>   		$(s) $(TARGET_DIR)$(sep))
> -endif
>
>   ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
>   LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
>


-- 
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

[Buildroot] [PATCH v2 1/3] post-build: show each script filename before execution

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 Arnout> On 08/04/13 18:50, Luca Ceresoli wrote:
 >> This also simplifies code by removing the ifneq/endif clauses.
 >> 
 >> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

 Arnout> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

FYI, I applied this and the post-image patch on the 24th.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v2 2/3] post-image: show each script filename before execution

[Luca Ceresoli]

This also simplifies code by removing the ifneq/endif clauses.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 Makefile |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 75f0f0c..f475d1b 100644
--- a/Makefile
+++ b/Makefile
@@ -555,11 +555,9 @@ target-generatelocales: host-localedef
 endif
 
 target-post-image:
-ifneq ($(BR2_ROOTFS_POST_IMAGE_SCRIPT),"")
-	@$(call MESSAGE,"Executing post-image script\(s\)")
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
+		$(call MESSAGE,"Executing post-image script $(s)"); \
 		$(s) $(BINARIES_DIR)$(sep))
-endif
 
 toolchain-eclipse-register:
 	./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)
-- 
1.7.10.4

[Buildroot] [PATCH v2 2/3] post-image: show each script filename before execution

[Yann E. MORIN]

Luca, All,

On Mon, Apr 08, 2013 at 06:50:15PM +0200, Luca Ceresoli wrote:
> This also simplifies code by removing the ifneq/endif clauses.
> 
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

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

[Buildroot] [PATCH v2 2/3] post-image: show each script filename before execution

[Peter Korsgaard]

>>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> writes:

 Luca> This also simplifies code by removing the ifneq/endif clauses.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v2 2/3] post-image: show each script filename before execution

[Arnout Vandecappelle]

On 08/04/13 18:50, Luca Ceresoli wrote:
> This also simplifies code by removing the ifneq/endif clauses.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

> ---
>   Makefile |    4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 75f0f0c..f475d1b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -555,11 +555,9 @@ target-generatelocales: host-localedef
>   endif
>
>   target-post-image:
> -ifneq ($(BR2_ROOTFS_POST_IMAGE_SCRIPT),"")
> -	@$(call MESSAGE,"Executing post-image script\(s\)")
>   	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
> +		$(call MESSAGE,"Executing post-image script $(s)"); \
>   		$(s) $(BINARIES_DIR)$(sep))
> -endif
>
>   toolchain-eclipse-register:
>   	./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)
>


-- 
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

[Buildroot] [PATCH v2 3/3] rootfs-overlay: use a make foreach instead of a shell for

[Luca Ceresoli]

Makes the code uniform with the post-build and post-image implementation
(which is slightly simpler and, presumably, more efficient).

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
 Makefile |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f475d1b..a3b98f3 100644
--- a/Makefile
+++ b/Makefile
@@ -501,13 +501,12 @@ endif
 		echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \
 	) >  $(TARGET_DIR)/etc/os-release
 
-	@for dir in $(call qstrip,$(BR2_ROOTFS_OVERLAY)); do \
-		$(call MESSAGE,"Copying overlay $${dir}"); \
+	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
+		$(call MESSAGE,"Copying overlay $(d)"); \
 		rsync -a \
 			--exclude .empty --exclude .svn --exclude .git \
 			--exclude .hg --exclude '*~' \
-			$${dir}/ $(TARGET_DIR); \
-	done
+			$(d)/ $(TARGET_DIR)$(sep))
 
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
 		$(call MESSAGE,"Executing  post-build script $(s)"); \
-- 
1.7.10.4

[Buildroot] [PATCH v2 3/3] rootfs-overlay: use a make foreach instead of a shell for

[Yann E. MORIN]

Luca, All,

On Mon, Apr 08, 2013 at 06:50:16PM +0200, Luca Ceresoli wrote:
> Makes the code uniform with the post-build and post-image implementation
> (which is slightly simpler and, presumably, more efficient).
> 
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

(not tested, I don't have rootfs overlays).

Regards,
Yann E. MORIN.

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

[Buildroot] [PATCH v2 3/3] rootfs-overlay: use a make foreach instead of a shell for

[Arnout Vandecappelle]

On 08/04/13 18:50, Luca Ceresoli wrote:
> Makes the code uniform with the post-build and post-image implementation
> (which is slightly simpler and, presumably, more efficient).
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

  I thought about the possibility to refactor these three use cases into 
a single make function, but it would actually just complicate things.

  Regards,
  Arnout

> ---
>   Makefile |    7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index f475d1b..a3b98f3 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -501,13 +501,12 @@ endif
>   		echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \
>   	) >  $(TARGET_DIR)/etc/os-release
>
> -	@for dir in $(call qstrip,$(BR2_ROOTFS_OVERLAY)); do \
> -		$(call MESSAGE,"Copying overlay $${dir}"); \
> +	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
> +		$(call MESSAGE,"Copying overlay $(d)"); \
>   		rsync -a \
>   			--exclude .empty --exclude .svn --exclude .git \
>   			--exclude .hg --exclude '*~' \
> -			$${dir}/ $(TARGET_DIR); \
> -	done
> +			$(d)/ $(TARGET_DIR)$(sep))
>
>   	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
>   		$(call MESSAGE,"Executing  post-build script $(s)"); \
>


-- 
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

[Buildroot] [PATCH v2 3/3] rootfs-overlay: use a make foreach instead of a shell for

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 Arnout> On 08/04/13 18:50, Luca Ceresoli wrote:
 >> Makes the code uniform with the post-build and post-image implementation
 >> (which is slightly simpler and, presumably, more efficient).
 >> 
 >> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

 Arnout> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v2 3/3] rootfs-overlay: use a make foreach instead of a shell for

[Luca Ceresoli]

Arnout Vandecappelle wrote:
> On 08/04/13 18:50, Luca Ceresoli wrote:
>> Makes the code uniform with the post-build and post-image implementation
>> (which is slightly simpler and, presumably, more efficient).
>>
>> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
>  I thought about the possibility to refactor these three use cases 
> into a single make function, but it would actually just complicate 
> things.

I considered this as well, but for so few lines it would be overkill.

Thanks for your review,
Luca