* [Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled
@ 2016-04-23 19:18 Peter Seiderer
2016-05-08 14:13 ` Yann E. MORIN
2016-05-13 20:07 ` Thomas Petazzoni
0 siblings, 2 replies; 7+ messages in thread
From: Peter Seiderer @ 2016-04-23 19:18 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled
2016-04-23 19:18 [Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled Peter Seiderer
@ 2016-05-08 14:13 ` Yann E. MORIN
2016-05-12 19:06 ` Peter Seiderer
2016-05-13 20:07 ` Thomas Petazzoni
1 sibling, 1 reply; 7+ messages in thread
From: Yann E. MORIN @ 2016-05-08 14:13 UTC (permalink / raw)
To: buildroot
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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled
2016-05-08 14:13 ` Yann E. MORIN
@ 2016-05-12 19:06 ` Peter Seiderer
2016-05-14 21:20 ` Arnout Vandecappelle
0 siblings, 1 reply; 7+ messages in thread
From: Peter Seiderer @ 2016-05-12 19:06 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled
2016-05-12 19:06 ` Peter Seiderer
@ 2016-05-14 21:20 ` Arnout Vandecappelle
2016-05-15 13:42 ` Thomas Petazzoni
0 siblings, 1 reply; 7+ messages in thread
From: Arnout Vandecappelle @ 2016-05-14 21:20 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled
2016-05-14 21:20 ` Arnout Vandecappelle
@ 2016-05-15 13:42 ` Thomas Petazzoni
2016-05-15 20:21 ` Peter Korsgaard
0 siblings, 1 reply; 7+ messages in thread
From: Thomas Petazzoni @ 2016-05-15 13:42 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled
2016-05-15 13:42 ` Thomas Petazzoni
@ 2016-05-15 20:21 ` Peter Korsgaard
0 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2016-05-15 20:21 UTC (permalink / raw)
To: buildroot
>>>>> "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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled
2016-04-23 19:18 [Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled Peter Seiderer
2016-05-08 14:13 ` Yann E. MORIN
@ 2016-05-13 20:07 ` Thomas Petazzoni
1 sibling, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2016-05-13 20:07 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-05-15 20:21 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-23 19:18 [Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled Peter Seiderer
2016-05-08 14:13 ` Yann E. MORIN
2016-05-12 19:06 ` Peter Seiderer
2016-05-14 21:20 ` Arnout Vandecappelle
2016-05-15 13:42 ` Thomas Petazzoni
2016-05-15 20:21 ` Peter Korsgaard
2016-05-13 20:07 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox