diff --git a/.github/workflows/publish-openstore.yml b/.github/workflows/publish-openstore.yml index 35b8499d8..ab717f867 100644 --- a/.github/workflows/publish-openstore.yml +++ b/.github/workflows/publish-openstore.yml @@ -184,7 +184,11 @@ jobs: export AARCH64_KRYON_CURL_CFLAGS="-DCURL_STATICLIB -I$click_curl_dir/include" export AARCH64_KRYON_CURL_LDLIBS="$click_curl_dir/lib/libcurl.a -L/opt/inbe-openssl/lib -lssl -lcrypto -lz -lpthread" # The framework supplies graphics libraries for the device's GPU. - export AARCH64_CLICK_RUNTIME_LIBS="$(pkg-config --variable=libdir sdl2)/libSDL2-2.0.so.0 /opt/inbe-sdl2/lib/SDL2-LICENSE.txt /opt/inbe-openssl/lib/libssl.so.3 /opt/inbe-openssl/lib/libcrypto.so.3 /opt/inbe-openssl/lib/OpenSSL-LICENSE.txt /usr/lib/aarch64-linux-gnu/libatomic.so.1 /usr/lib/aarch64-linux-gnu/libz.so.1" + atomic_runtime="$("$AARCH64_CC" -print-file-name=libatomic.so.1)" + export AARCH64_CLICK_RUNTIME_LIBS="$(pkg-config --variable=libdir sdl2)/libSDL2-2.0.so.0 /opt/inbe-sdl2/lib/SDL2-LICENSE.txt /opt/inbe-openssl/lib/libssl.so.3 /opt/inbe-openssl/lib/libcrypto.so.3 /opt/inbe-openssl/lib/OpenSSL-LICENSE.txt $atomic_runtime /usr/lib/aarch64-linux-gnu/libz.so.1" + for runtime_file in $AARCH64_CLICK_RUNTIME_LIBS; do + test -f "$runtime_file" + done # Make otherwise prefers the SDK's older /usr/bin/cmake. export CMAKE="$(python3 -c 'import cmake; print(cmake.CMAKE_BIN_DIR + "/cmake")')" "$CMAKE" --version diff --git a/scripts/check-click-abi.py b/scripts/check-click-abi.py index 9f9bc9011..1c095efb7 100644 --- a/scripts/check-click-abi.py +++ b/scripts/check-click-abi.py @@ -24,6 +24,8 @@ def verify(package): for name in ("libEGL.so.1", "libGLESv2.so.2", "libGLdispatch.so.0"): if (root / "usr/lib" / name).exists(): raise ValueError(f"{name}: use the framework's device graphics driver") + if not (root / "usr/lib/libatomic.so.1").is_file(): + raise ValueError("package must include the target compiler's libatomic runtime") checked = 0 for path in sorted(root.rglob("*")): if not path.is_file() or path.is_symlink():