[Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

[Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

[Peter Seiderer]

Use rsync with '--keep-dirlinks' option to prevent rootfs overlay to
overwrite /usr, /bin, /sbin and /lib links in case BR2_ROOTFS_MERGED_USR
option is enabled.

Steps to reproduce failure:

- enable BR2_ROOTFS_MERGED_USR
- mkdir some_path/rootfs-overlay/lib/firmware/some_file.txt
- enable BR2_ROOTFS_OVERLAY="some_path/rootfs-overlay"
- run 'make'
- 'target/lib' contains only the files from 'some_path/rootfs-overlay/lib' instead
  of the original symlink 'lib -> usr/lib'.

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0e4beb2..243823c 100644
--- a/Makefile
+++ b/Makefile
@@ -657,7 +657,7 @@ endif
 
 	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
 		$(call MESSAGE,"Copying overlay $(d)"); \
-		rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
+		rsync -a --ignore-times --keep-dirlinks $(RSYNC_VCS_EXCLUSIONS) \
 			--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \
 			$(d)/ $(TARGET_DIR)$(sep))
 
-- 
2.8.1

[Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

[Yann E. MORIN]

Peter, All,

Nit-picking: when you send the 'v1' of a patch, you need not add 'v1' to
it. Only 'v2' and above need a version /tag/.

On 2016-04-23 21:18 +0200, Peter Seiderer spake thusly:
> Use rsync with '--keep-dirlinks' option to prevent rootfs overlay to
> overwrite /usr, /bin, /sbin and /lib links in case BR2_ROOTFS_MERGED_USR
> option is enabled.
> 
> Steps to reproduce failure:
> 
> - enable BR2_ROOTFS_MERGED_USR
> - mkdir some_path/rootfs-overlay/lib/firmware/some_file.txt
> - enable BR2_ROOTFS_OVERLAY="some_path/rootfs-overlay"
> - run 'make'
> - 'target/lib' contains only the files from 'some_path/rootfs-overlay/lib' instead
>   of the original symlink 'lib -> usr/lib'.
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>

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

Regards,
Yann E. MORIN.

> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 0e4beb2..243823c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -657,7 +657,7 @@ endif
>  
>  	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
>  		$(call MESSAGE,"Copying overlay $(d)"); \
> -		rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
> +		rsync -a --ignore-times --keep-dirlinks $(RSYNC_VCS_EXCLUSIONS) \
>  			--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \
>  			$(d)/ $(TARGET_DIR)$(sep))
>  
> -- 
> 2.8.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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 v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

[Peter Seiderer]

Hello Yann,

On Sun, 8 May 2016 16:13:13 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Peter, All,
> 
> Nit-picking: when you send the 'v1' of a patch, you need not add 'v1' to
> it. Only 'v2' and above need a version /tag/.
> 

Yes I know it is not necessary...., but I find it supportive for my 'workflow',
having local copies of the sent patches combined e.g.

  v1-0001-some-patch-subject.patch
  v2-0001-some-patch-subject.patch
  ....

instead of

  0001-some-patch-subject.patch
  v2-0001-some-patch-subject.patch

But I can try to change my habit in case more mailing list people prefer it otherwise...

Regards,
Peter

[Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

[Thomas Petazzoni]

Hello,

On Sat, 23 Apr 2016 21:18:29 +0200, Peter Seiderer wrote:
> Use rsync with '--keep-dirlinks' option to prevent rootfs overlay to
> overwrite /usr, /bin, /sbin and /lib links in case BR2_ROOTFS_MERGED_USR
> option is enabled.
> 
> Steps to reproduce failure:
> 
> - enable BR2_ROOTFS_MERGED_USR
> - mkdir some_path/rootfs-overlay/lib/firmware/some_file.txt
> - enable BR2_ROOTFS_OVERLAY="some_path/rootfs-overlay"
> - run 'make'
> - 'target/lib' contains only the files from 'some_path/rootfs-overlay/lib' instead
>   of the original symlink 'lib -> usr/lib'.
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

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

[Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

[Arnout Vandecappelle]

On 05/12/16 21:06, Peter Seiderer wrote:
> Hello Yann,
>
> On Sun, 8 May 2016 16:13:13 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
>
>> Peter, All,
>>
>> Nit-picking: when you send the 'v1' of a patch, you need not add 'v1' to
>> it. Only 'v2' and above need a version /tag/.
>>
>
> Yes I know it is not necessary...., but I find it supportive for my 'workflow',
> having local copies of the sent patches combined e.g.
>
>   v1-0001-some-patch-subject.patch
>   v2-0001-some-patch-subject.patch
>   ....
>
> instead of
>
>   0001-some-patch-subject.patch
>   v2-0001-some-patch-subject.patch
>
> But I can try to change my habit in case more mailing list people prefer it otherwise...

  It certainly doesn't bother me, and I doubt that interferes with Peter's or 
Thomas's workflow too. So unless they object a second time, just keep on doing 
what works for you.

  Regards,
  Arnout


-- 
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:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

[Thomas Petazzoni]

Hello,

On Sat, 14 May 2016 23:20:01 +0200, Arnout Vandecappelle wrote:

> > Yes I know it is not necessary...., but I find it supportive for my 'workflow',
> > having local copies of the sent patches combined e.g.
> >
> >   v1-0001-some-patch-subject.patch
> >   v2-0001-some-patch-subject.patch
> >   ....
> >
> > instead of
> >
> >   0001-some-patch-subject.patch
> >   v2-0001-some-patch-subject.patch
> >
> > But I can try to change my habit in case more mailing list people prefer it otherwise...  
> 
>   It certainly doesn't bother me, and I doubt that interferes with Peter's or 
> Thomas's workflow too. So unless they object a second time, just keep on doing 
> what works for you.

It doesn't matter at all for me, I'm fine with seeing "v1" for the
first version.

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

[Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 >> It certainly doesn't bother me, and I doubt that interferes with
 >> Peter's or Thomas's workflow too. So unless they object a second
 >> time, just keep on doing what works for you.

 > It doesn't matter at all for me, I'm fine with seeing "v1" for the
 > first version.

yeah, same here.

-- 
Bye, Peter Korsgaard