[Buildroot] [PATCH v1] Makefile: fix rootfs overlay with BR2_ROOTFS_MERGED_USR enabled
Peter Seiderer
ps.report at gmx.net
Sat Apr 23 19:18:29 UTC 2016
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 at 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
More information about the buildroot
mailing list