Fix EGL: trim before the Adreno SONAME links (#690)

Fix EGL: trim before the Adreno SONAME links, its ldconfig pointed them back to glvnd

Dockerfile.agnos

@@ -143,6 +143,9 @@ RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \
 # Setup hostname resolution for our custom hostname
 RUN sed -i 's/hosts:          files dns myhostname/hosts:          files myhostname dns/g' /etc/nsswitch.conf
 
+COPY ./userspace/trim.sh /tmp/agnos/
+RUN /tmp/agnos/trim.sh
+
 # keep this last
 RUN ldconfig
 # ldconfig rewrites these SONAME links back to Mesa; raylib COMMA needs Adreno.
@@ -155,9 +158,6 @@ RUN cd /usr/lib/aarch64-linux-gnu && \
     rm -f libgbm.so.1 && \
     mv /tmp/libgbm_adreno.so libgbm.so.1
 
-COPY ./userspace/trim.sh /tmp/agnos/
-RUN /tmp/agnos/trim.sh
-
 # Setup RO rootfs
 RUN mkdir -p /rwtmp
 RUN mkdir -p /tmptmp

userspace/trim.sh

@@ -22,6 +22,3 @@ lib=/usr/lib/aarch64-linux-gnu
 rm -f "$lib"/libgallium-*.so "$lib"/libEGL_mesa.so* "$lib"/libGLX_mesa.so* "$lib"/libgbm.so.1.0.0
 rm -rf "$lib"/dri "$lib"/gbm
 rm /usr/share/glvnd/egl_vendor.d/50_mesa.json
-
-# Drop the removed libraries from ld.so.cache.
-ldconfig