Skip to content

Commit 9d4ea24

Browse files
committed
fwk: Package dynamic libs with util binaries
Can't run the binaries because they link to the specific libs from the chroot. So need to include those. ``` > LD_LIBRARY_PATH=. ldd ./ectool linux-vdso.so.1 (0x00007f7cb55d7000) libftdi1.so.2 => /lib64/libftdi1.so.2 (0x00007f7cb5569000) libusb-1.0.so.0 => /lib64/libusb-1.0.so.0 (0x00007f7cb554a000) libec.so => ./libec.so (0x00007f7cb54ee000) libbase-core.so => ./libbase-core.so (0x00007f7cb5000000) libc++.so.1 => ./libc++.so.1 (0x00007f7cb53fc000) libc++abi.so.1 => ./libc++abi.so.1 (0x00007f7cb53b8000) libm.so.6 => /lib64/libm.so.6 (0x00007f7cb4f11000) libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007f7cb4ee4000) libc.so.6 => /lib64/libc.so.6 (0x00007f7cb4cf2000) libudev.so.1 => /lib64/libudev.so.1 (0x00007f7cb4cab000) libabseil_dll.so.2308.0.0 => ./libabseil_dll.so.2308.0.0 (0x00007f7cb4ba4000) libbrillo-core.so => ./libbrillo-core.so (0x00007f7cb4b63000) libdouble-conversion.so.3 => /lib64/libdouble-conversion.so.3 (0x00007f7cb4b4d000) libglib-2.0.so.0 => /lib64/libglib-2.0.so.0 (0x00007f7cb49f7000) libevent_core-2.1.so.7 => /lib64/libevent_core-2.1.so.7 (0x00007f7cb49be000) /lib64/ld-linux-x86-64.so.2 (0x00007f7cb55d9000) libcap.so.2 => /lib64/libcap.so.2 (0x00007f7cb49b2000) libcrypto.so.3 => /lib64/libcrypto.so.3 (0x00007f7cb4400000) libstdc++.so.6 => /lib64/libstdc++.so.6 (0x00007f7cb4000000) libpcre2-8.so.0 => /lib64/libpcre2-8.so.0 (0x00007f7cb4907000) libz.so.1 => /lib64/libz.so.1 (0x00007f7cb48e4000) ``` BUG= BRANCH=fwk-main TEST=Download util artifacts, go in that folder and run `sudo LD_LIBRARY_PATH=. ./ectool version` TEST=Check that ldd can find all dynamic libraries Signed-off-by: Daniel Schaefer <dhs@frame.work> (cherry picked from commit 7b9466d)
1 parent 68651cd commit 9d4ea24

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

.github/workflows/zephyr-build.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,20 @@ jobs:
9999
name: ${{ matrix.platform.name }}.${{ env.VERSIONINFO }}
100100
path: /${{ matrix.platform.folder }}/ec_home/chromiumos/src/platform/ec/build/zephyr/${{ matrix.platform.name }}/output
101101

102+
- name: Package dynamic libs with util (enough to run ectool)
103+
run: |
104+
# Check which libraries it links to
105+
ldd src/platform/ec/build/host/util/ectool
106+
# Copy libraries to util folder so we can run it with
107+
# sudo LD_LIBRARY_PATH=. ./ectool
108+
cp chroot/usr/lib64/libec.so src/platform/ec/build/host/util/
109+
cp chroot/usr/lib64/libbase-core.so src/platform/ec/build/host/util/
110+
cp chroot/usr/lib64/libc++.so.1 src/platform/ec/build/host/util/
111+
cp chroot/usr/lib64/libc++abi.so.1 src/platform/ec/build/host/util/
112+
cp chroot/usr/lib64/libabseil_dll.so.2308.0.0 src/platform/ec/build/host/util/
113+
cp chroot/usr/lib64/libfmap.so.0 src/platform/ec/build/host/util/
114+
cp chroot/usr/lib64/libbrillo-core.so src/platform/ec/build/host/util/
115+
102116
- uses: actions/upload-artifact@v4
103117
with:
104118
name: util_${{ matrix.platform.name }}.${{ env.VERSIONINFO }}

0 commit comments

Comments
 (0)