diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-03-18 05:57:41 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-03-18 05:57:41 +0000 |
| commit | 63d57ee3443baae4168793350565ef1402139f04 (patch) | |
| tree | 40a2e2122149c2248c19e7149e76c46e7b0db33c | |
| parent | Merging upstream version 22.02.122. (diff) | |
| download | plymouth-63d57ee3443baae4168793350565ef1402139f04.tar.xz plymouth-63d57ee3443baae4168793350565ef1402139f04.zip | |
Merging debian version 22.02.122-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/local/plymouth.hook | 16 |
2 files changed, 26 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 4c81e9b..f688a28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +plymouth (22.02.122-1) unstable; urgency=medium + + [ Laurent Bigonville ] + * New upstream release, upstream will now release more frequent snapshot + releases + + [ Alper Nebi Yasak ] + * debian/local/plymouth.hook: Apply module exclusions for MODULES=dep as well + * debian/local/plymouth.hook: Add panfrost to excluded DRM modules (Closes: + #1007730) + + -- Laurent Bigonville <bigon@debian.org> Thu, 17 Mar 2022 18:09:27 +0100 + plymouth (0.9.5+git20211018-1~progress6+u1) fuchur-backports; urgency=medium * Initial upload to fuchur-backports. diff --git a/debian/local/plymouth.hook b/debian/local/plymouth.hook index c734f51..5e0e4cd 100644 --- a/debian/local/plymouth.hook +++ b/debian/local/plymouth.hook @@ -144,16 +144,26 @@ case "${THEME_NAME}" in esac # add drm modules +MODULES_EXCLUDE="mga r128 savage sis tdfx via panfrost" if [ "$MODULES" = "dep" ]; then for DRM_DEVICE in "/sys/class/drm"/*; do - DRM_DEVICE="$(readlink -f "$DRM_DEVICE")" \ - && sys_walk_mod_add "$DRM_DEVICE" \ + DRM_DEVICE="$(readlink -f "$DRM_DEVICE")" || continue + MODULE_PATH="$(readlink -f "$DRM_DEVICE/device/driver/module")" || continue + MODULE_NAME="$(basename "$MODULE_PATH")" || continue + + for m in $MODULES_EXCLUDE; do + if [ "$MODULE_NAME" = "$m" ]; then + continue 2 + fi + done + + sys_walk_mod_add "$DRM_DEVICE" \ || echo "W: plymouth: couldn't include modules for '$DRM_DEVICE'" done elif [ "$MODULES" = "list" ]; then echo "W: plymouth: not including drm modules since MODULES=list" else - copy_modules_dir kernel/drivers/gpu/drm mga r128 savage sis tdfx via + copy_modules_dir kernel/drivers/gpu/drm $MODULES_EXCLUDE fi # copy renderers |