fix(build): validate Rockchip tooling inputs

Author: Producdevity

tools/build-dependencies.sh

@@ -1,13 +1,10 @@
 #!/bin/sh
 set -eu
 
-case "${1:-}" in
-"" | --toolchain-only) ;;
-*)
+if [ "$#" -gt 1 ] || { [ "$#" -eq 1 ] && [ "$1" != "--toolchain-only" ]; }; then
   echo "usage: $0 [--toolchain-only]" >&2
   exit 1
-  ;;
-esac
+fi
 
 ROOT=$(CDPATH='' cd -- "$(dirname -- "$0")/.." && pwd)
 TOOLS="$ROOT/.tools"

tools/build-mpp.sh

@@ -40,7 +40,7 @@ if [ -n "${MPP_LINK_LIBRARY:-}" ]; then
     exit 1
   }
   mpp_link=$MPP_LINK_LIBRARY
-  bundled_mpp=0
+  mpp_runtime=$MPP_LINK_LIBRARY
 else
   "$ROOT/tools/build-dependencies.sh" --toolchain-only
   # MPP invokes CMAKE_LINKER directly to merge target object files with `-r`.
@@ -53,11 +53,11 @@ else
   cmake --build "$BUILD_DIR" --target rockchip_mpp --parallel
   mpp_headers="$MPP_SOURCE/inc"
   mpp_link="$BUILD_DIR/mpp/librockchip_mpp.so"
-  "$ZIG_RUN" objcopy --strip-all "$BUILD_DIR/mpp/librockchip_mpp.so.0" \
-    "$OUTPUT_DIR/librockchip_mpp.so.1"
-  bundled_mpp=1
+  mpp_runtime="$BUILD_DIR/mpp/librockchip_mpp.so.0"
 fi
 
+"$ZIG_RUN" objcopy --strip-all "$mpp_runtime" "$OUTPUT_DIR/librockchip_mpp.so.1"
+
 "$ZIG_RUN" cc -target aarch64-linux-gnu.2.38 -O2 -fPIC -fvisibility=hidden -shared -s \
   -ffile-prefix-map="$ROOT"=. -Werror -Wall -Wextra \
   -I"$ROOT/src/media/video" -I"$mpp_headers" \
@@ -76,9 +76,7 @@ fi
   -ldl -Wl,-rpath,'$ORIGIN' -o "$OUTPUT_DIR/greenovercast-mpp-bridge-test.aarch64"
 
 file "$OUTPUT_DIR/libgreenovercast-mpp.so"
-if [ "$bundled_mpp" -eq 1 ]; then
-  file "$OUTPUT_DIR/librockchip_mpp.so.1"
-fi
+file "$OUTPUT_DIR/librockchip_mpp.so.1"
 printf 'built: %s\n' "$OUTPUT_DIR/libgreenovercast-mpp.so"
 printf 'built: %s\n' "$OUTPUT_DIR/greenovercast-mpp-probe.aarch64"
 printf 'built: %s\n' "$OUTPUT_DIR/greenovercast-mpp-bridge-test.aarch64"

tools/video-diagnostics.sh

@@ -3,7 +3,7 @@ set -u
 
 app_dir=${1:-.}
 mpp_plugin=${GREENOVERCAST_MPP_LIBRARY:-$app_dir/libgreenovercast-mpp.so}
-if [ -x "$app_dir/rockchip/greenovercast-mpp-probe.aarch64" ]; then
+if [ -f "$app_dir/rockchip/greenovercast-mpp-probe.aarch64" ]; then
   mpp_probe="$app_dir/rockchip/greenovercast-mpp-probe.aarch64"
   private_mpp_dir="$app_dir/rockchip"
 else
@@ -38,6 +38,10 @@ if command -v ldd >/dev/null 2>&1; then
   printf 'MPP dependencies using firmware libraries:\n'
   LD_LIBRARY_PATH="$app_dir:${LD_LIBRARY_PATH:-}" ldd "$mpp_plugin" 2>&1
 fi
+if [ -f "$mpp_probe" ] && [ ! -x "$mpp_probe" ]; then
+  printf 'MPP probe: not executable\n'
+  exit 1
+fi
 if [ -x "$mpp_probe" ]; then
   printf 'MPP firmware probe:\n'
   if GREENOVERCAST_MPP_LIBRARY="$mpp_plugin" \