aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Hall <tylerwhall@gmail.com>2016-03-08 21:07:40 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-10 23:13:54 +0000
commitb578a06564599969891b7ba1274d6b3bb363b27c (patch)
treef7a9bcd76d330efc89f827203990a0383523f193
parentc706b5efb6470101a103762511b52112c444f799 (diff)
downloadopenembedded-core-contrib-b578a06564599969891b7ba1274d6b3bb363b27c.tar.gz
image-mklibs: handle position independent binaries
Executables built with -fpie have the ELF type DYN rather than EXEC which makes them difficult to distinguish from shared libraries. Currently when building the list of executables we omit these binaries so they might fail to run on the resultant rootfs due to missing symbols. One of these is systemd which builds -fpie unconditionally, so mklibs breaks images containing systemd. Modify the search to catch all executable files that are ELF and have an interpreter set. Omit libc and libpthread as special cases because they have an interpreter and are directly executable but treating them as such is antithetical to the pupose of mklibs. (From OE-Core rev: 30da34ef032d5b4b2f694743715f2c8d64dd9849) Signed-off-by: Tyler Hall <tylerwhall@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image-mklibs.bbclass16
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass
index 6c0e8dcf35..5f6df1b17f 100644
--- a/meta/classes/image-mklibs.bbclass
+++ b/meta/classes/image-mklibs.bbclass
@@ -9,13 +9,15 @@ mklibs_optimize_image_doit() {
mkdir -p ${WORKDIR}/mklibs/dest
cd ${IMAGE_ROOTFS}
du -bs > ${WORKDIR}/mklibs/du.before.mklibs.txt
- for i in `find .`; do file $i; done \
- | grep ELF \
- | grep "LSB *executable" \
- | grep "dynamically linked" \
- | sed "s/:.*//" \
- | sed "s+^\./++" \
- > ${WORKDIR}/mklibs/executables.list
+
+ # Build a list of dynamically linked executable ELF files.
+ # Omit libc/libpthread as a special case because it has an interpreter
+ # but is primarily what we intend to strip down.
+ for i in `find . -type f -executable ! -name 'libc-*' ! -name 'libpthread-*'`; do
+ file $i | grep -q ELF || continue
+ ${HOST_PREFIX}readelf -l $i | grep -q INTERP || continue
+ echo $i
+ done > ${WORKDIR}/mklibs/executables.list
dynamic_loader=$(linuxloader)