regression: osk-sdl initramfs hooks includes too many dri modules
Since !13 (merged) the initramfs hooks copies to many modules:
du -hs usr/lib/aarch64-linux-gnu/dri/
103M
$ ls -l usr/lib/aarch64-linux-gnu/dri/ | wc -l
42
While with older versions:
$ du -hs usr/lib/aarch64-linux-gnu/dri/
22M usr/lib/aarch64-linux-gnu/dri/
$ ls -l usr/lib/aarch64-linux-gnu/dri/
total 21808
-rw-r--r-- 1 agx agx 22325656 Okt 30 19:49 etnaviv_dri.so
lrwxrwxrwx 1 agx agx 14 Okt 30 19:49 imx-dcss_dri.so -> etnaviv_dri.so
lrwxrwxrwx 1 agx agx 14 Okt 30 19:49 imx-drm_dri.so -> etnaviv_dri.so
lrwxrwxrwx 1 agx agx 14 Okt 30 19:49 mxsfb-drm_dri.so -> etnaviv_dri.so
lrwxrwxrwx 1 agx agx 14 Okt 30 19:49 panfrost_dri.so -> etnaviv_dri.so
lrwxrwxrwx 1 agx agx 14 Okt 30 19:49 sun4i-drm_dri.so -> etnaviv_dri.so
@sebastian.krzyszkowiak (as you prepared !13 (merged)): one can see from the diff that dri modules are copied unconditionally now rather than based on the architecture:
diff --git a/debian/initramfs/hooks/osk-sdl b/debian/initramfs/hooks/osk-sdl
index b2e167c..469934a 100755
--- a/debian/initramfs/hooks/osk-sdl
+++ b/debian/initramfs/hooks/osk-sdl
@@ -18,50 +18,43 @@ esac
# Many dri modules are kmsro, use a symlink there
dri_inst() {
- so_src="${libdir}/dri/$1"
- shift
- sos=$@
- so_sum=$(md5sum "${so_src}" | awk '{ print $1 }')
-
- copy_exec "${so_src}"
- for so in $sos; do
- if [ "$(md5sum "${libdir}/dri/${so}" | awk '{ print $1 }')" = "${so_sum}" ]; then
- ln -s "$(basename "${so_src}")" "${DESTDIR}/${libdir}/dri/${so}"
+ for so in "${libdir}/dri/"*_dri.so; do
+ current_so_sum="$(md5sum "${so}" | awk '{ print $1 }')"
+ if [ "x${current_so_sum}" = "x${so_sum}" ]; then
+ ln -s "$(basename "${so_src}")" "${DESTDIR}/${so}"
else
- copy_exec "${libdir}/dri/${so}"
+ copy_exec "${so}"
+ so_sum="${current_so_sum}"
+ so_src="${so}"
fi
done
Could you revert that bit?