allow packages to install *.o files into the image #4191
Conversation
commit c468820 "scripts/build: cleanup" started to silently remove *.o files from the installation without giving an explanation why this should be needed. Drop that as it prevents packages from including *.o files in the image, which eg is needed to include IR BPF decoders in LibreELEC. Packages which install *.o files that should not end up in the image should manually remove these in post_makeinstall_target. Signed-off-by: Matthias Reichl <hias@horus.com>
Several packages call safe_remove with a wildcard to remove multiple files but safe_remove only deleted the first one. Fix this by iterating over all arguments passed into safe_remove so unwanted files don't end up in the image. Signed-off-by: Matthias Reichl <hias@horus.com>
Signed-off-by: Matthias Reichl <hias@horus.com>
HiassofT
force-pushed
the
le10-fix-obj-remove
branch
from
0bd44ad
to
7b79001
Compare
|
did you verify that no other object files were installed into the image with this change? |
|
I compared before/after images and didn't see any difference. |
👍 The other problem is that I'd suggest changing the |
|
bueller? |
|
I believe @HiassofT is busy this weekend... I'm not sure of the specifics that led to the safe_remove changes. |
|
The introduction of safe_remove converted several rm -f / rm -rf statements with wildcards to use safe_remove - see commit 2ca0df2. Then commit 56cbf64 did the same for glibc and a2ca748 added a safe_remove with wildcard for weston. This leads to two problems: if safe_remove doesn't follow rm semantics (allowing multiple files to be removed in a single call) that's quite unexpected behavior. Even more so as the first examples of safe_remove being used did so with wildcards (which would have lead to files not being removed, compared to the previous rm, if additional files matching the patterns were being installed by updated package versions). So I'd say safe_remove implementation should be as I fixed it with the PR. It's rather easy that someone adds safe_remove with a wildcard (potentially matching multiple files) in the future, and only deleting the first file is a bug. It can also be helpful to find out about no longer existing files, like we already got a bunch of: If someone prefers to change safe_remove with wildcards back to rm please do that in a separate PR |
*.o files were silently removed in scripts/build (for no obvious reason) which prevents shipping *.o files in the LE image. Drop that so we can include IR BPF decoders in the image.
This drop revealed a bug in safe_remove, it's called with wildcards in several places but it only removed the first file so several *.o files from glibc ended up in /usr/lib.
Python3 installs a python.o file eg in /usr/lib/python3.7/config-3.7-x86_64-linux-gnu/python.o, delete this is post_makeinstall_target.
With these changes both RPi4 and Generic images built fine and didn't include any unwanted *.o files.