Skip to contentSkip to conversation

Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

PATCH New Peter Seiderer 5 participants 7 messages Apr 23, 2016 – May 15, 2016 Kbuild

lore
Share & tools
lore

Peter Seiderer

author
#0 lore raw

PATCH 1/1 Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

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 <[email protected]>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index 0e4beb2..243823c 100644
@@ -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))
Signature · 1 line
2.8.1
#1 lore raw

PATCH 1/1 Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

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:

Quoted 6 lines

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:

Quoted 8 lines

- 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 <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 24 lines
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index 0e4beb2..243823c 100644
@@ -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))
Signature · 6 lines
2.8.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
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.  |
'------------------------------^-------^------------------^--------------------'
author
#2 lore raw

PATCH 1/1 Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

Hello Yann,

Quoted 5 lines · 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/.

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

#3 lore raw

PATCH 1/1 Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

Quoted 17 lines · Peter Seiderer

Hello Yann,

Quoted 5 lines · 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/.

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

Quoted 6 lines

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

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

PATCH 1/1 Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

Hello,

Quoted 9 lines · Arnout Vandecappelle
Quoted 9 lines

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

Quoted 8 lines
Quoted 4 lines

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

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

PATCH 1/1 Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> 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.

Signature · 1 line
Bye, Peter Korsgaard
Applied
#6 lore raw

PATCH 1/1 Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled

In reply to Peter Seiderer

Hello,

Quoted 13 lines · 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'.

Quoted 4 lines
Signed-off-by Peter Seiderer <[email protected]>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

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