Makefile: move skeleton overlay installations before strip step
PATCH 1/1 Makefile: move skeleton overlay installations before strip step
Nothing prevents the skeleton overlays from having pre-built executables or libraries in them. Therefore, we should install the overlays prior to stripping, so that any such pre-built stuff gets stripped too.
--- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
Makefile +7 -6
@@ -513,6 +513,13 @@ ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y) find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f endif rm -rf $(TARGET_DIR)/usr/lib/luarocks + + @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ + $(call MESSAGE,"Copying overlay $(d)"); \ + rsync -a $(RSYNC_VCS_EXCLUSIONS) \ + --exclude .empty --exclude '*~' \ + $(d)/ $(TARGET_DIR)$(sep)) + $(STRIP_FIND_CMD) | xargs $(STRIPCMD) 2>/dev/null || true if test -d $(TARGET_DIR)/lib/modules; then \ find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
@@ -545,12 +552,6 @@ endif echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \ ) > $(TARGET_DIR)/etc/os-release - @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ - $(call MESSAGE,"Copying overlay $(d)"); \ - rsync -a $(RSYNC_VCS_EXCLUSIONS) \ - --exclude .empty --exclude '*~' \ - $(d)/ $(TARGET_DIR)$(sep)) - @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ $(call MESSAGE,"Executing post-build script $(s)"); \ $(USER_HOOKS_EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
Signature · 1 line
1.7.9.5
PATCH 1/1 Makefile: move skeleton overlay installations before strip step
Quoted 1 line · Danomi Manchego
Nothing prevents the skeleton overlays from having pre-built
Small nit: it's not a skeleton overlay, but a rootfs overlay (I first
thought you were talking about the skeleton, which is copied _before_ the build).
Quoted 3 lines
executables or libraries in them. Therefore, we should install the overlays prior to stripping, so that any such pre-built stuff gets stripped too.
I'm not sure if I agree with this change. I like the current situation
where the rootfs-overlay is really copied verbatim and you can trust it. If there are binaries in there, we can assume that the user has the cross-compiler available to strip them if he wants that.
That said, I can't think of a situation where it would be really
essential that the binaries are not stripped, and anyway in that case it is still possible to use BR2_STRIP_EXCLUDE_*. So I don't feel very strongly about this.
Regards,
Arnout
Quoted 38 lines
Signed-off-by Danomi Manchego <[email protected]>--- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)Makefile +7
-6@@ -513,6 +513,13 @@ ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y) find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f endif rm -rf $(TARGET_DIR)/usr/lib/luarocks + + @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ + $(call MESSAGE,"Copying overlay $(d)"); \ + rsync -a $(RSYNC_VCS_EXCLUSIONS) \ + --exclude .empty --exclude '*~' \ + $(d)/ $(TARGET_DIR)$(sep)) + $(STRIP_FIND_CMD) | xargs $(STRIPCMD) 2>/dev/null || true if test -d $(TARGET_DIR)/lib/modules; then \ find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \@@ -545,12 +552,6 @@ endif echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \ ) > $(TARGET_DIR)/etc/os-release - @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ - $(call MESSAGE,"Copying overlay $(d)"); \ - rsync -a $(RSYNC_VCS_EXCLUSIONS) \ - --exclude .empty --exclude '*~' \ - $(d)/ $(TARGET_DIR)$(sep)) - @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ $(call MESSAGE,"Executing post-build script $(s)"); \ $(USER_HOOKS_EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
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: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/1 Makefile: move skeleton overlay installations before strip step
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Quoted 1 line · Danomi Manchego
Nothing prevents the skeleton overlays from having pre-built
Small nit: it's not a skeleton overlay, but a rootfs overlay (I first
thought you were talking about the skeleton, which is copied _before_ the build).
Quoted 8 lines
Quoted 3 lines
executables or libraries in them. Therefore, we should install the overlays prior to stripping, so that any such pre-built stuff gets stripped too.
I'm not sure if I agree with this change. I like the current
situation where the rootfs-overlay is really copied verbatim and you can trust it. If there are binaries in there, we can assume that the user has the cross-compiler available to strip them if he wants that.
I agree. As it is now the user has full control, which is IMHO nice.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 Makefile: move skeleton overlay installations before strip step
Quoted 13 lines · Peter Korsgaard
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Quoted 1 line · Danomi Manchego
Nothing prevents the skeleton overlays from having pre-built
Small nit: it's not a skeleton overlay, but a rootfs overlay (I first
thought you were talking about the skeleton, which is copied _before_ the build).Quoted 3 lines
executables or libraries in them. Therefore, we should install the overlays prior to stripping, so that any such pre-built stuff gets stripped too.
Quoted 6 lines
Quoted 4 lines
I'm not sure if I agree with this change. I like the current
situation where the rootfs-overlay is really copied verbatim and you can trust it. If there are binaries in there, we can assume that the user has the cross-compiler available to strip them if he wants that.I agree. As it is now the user has full control, which is IMHO nice.
Okay, I can see that it might be expected that rootfs overlay content should be transferred as-is, I suppose. Let's consider this patch retracted, then.
Danomi -