Bug 51395 - plymouth: merge patches to UCS 5
plymouth: merge patches to UCS 5
Status: CLOSED FIXED
Product: UCS
Classification: Unclassified
Component: General
UCS 5.0
Other Linux
: P5 normal (vote)
: UCS 5.0
Assigned To: Jürn Brodersen
Philipp Hahn
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2020-06-02 14:48 CEST by Florian Best
Modified: 2021-05-25 16:02 CEST (History)
2 users (show)

See Also:
What kind of report is it?: Development Internal
What type of bug is this?: ---
Who will be affected by this bug?: ---
How will those affected feel about the bug?: ---
User Pain:
Enterprise Customer affected?:
School Customer affected?:
ISV affected?:
Waiting Support:
Flags outvoted (downgraded) after PO Review:
Ticket number:
Bug group (optional):
Max CVSS v3 score:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Florian Best univentionstaff 2020-06-02 14:48:54 CEST
The patches of plymouth have to be cherry-picked and rebased to UCS 5.0.
Comment 1 Florian Best univentionstaff 2020-06-02 16:21:47 CEST
055-set-default-text-theme.quilt:
The Upstream theme changed from "text" to "futureprototype".
Do we still need the patch? (Bug #22117)

076-mark-fb0-as-local-console.quilt:
The patched code does not exists anymore / was rewritten. (Bug #44061).
Comment 2 Jürn Brodersen univentionstaff 2020-06-14 14:00:04 CEST
Removed obsolete plymouth patches:

055-set-default-text-theme.quilt: The theme is now configured in the univention-bootsplash package

076-mark-fb0-as-local-console.quilt: The patch doesn't apply any more, the bootsplash and welcome screen work in kvm and virtualbox without the patch.

085-switch-to-welcome-before-quit.quilt: The dependency are now defined in the univention-welcome-screen.service, the plymouth-quit.service doesn't need to be to be patched any more.

Commits:

------------------------------------------------------------------------
r18922 | fbest | 2020-06-02 15:32:46 +0200 (Di, 02 Jun 2020) | 1 line

Bug #51395: cherry-pick patches to UCS 5.0

------------------------------------------------------------------------
r19062 | jbroders | 2020-06-14 13:48:03 +0200 (So, 14 Jun 2020) | 1 line

Bug #51395: remove obsolete patches
Comment 3 Philipp Hahn univentionstaff 2020-06-14 17:48:09 CEST
OK: diff -ur 4.3-0-0-ucs/0.9.2-4 5.0-0-0-ucs/0.9.4-1.1

(In reply to Jürn Brodersen from comment #2)
> 055-set-default-text-theme.quilt: The theme is now configured in the
> univention-bootsplash package

OK

> 076-mark-fb0-as-local-console.quilt: The patch doesn't apply any more, the
> bootsplash and welcome screen work in kvm and virtualbox without the patch.

OK

> 085-switch-to-welcome-before-quit.quilt: The dependency are now defined in
> the univention-welcome-screen.service, the plymouth-quit.service doesn't
> need to be to be patched any more.

OK

RFC: Is `081-welcome-screen-only-works-with-fb.quilt` still needed? Originally it was for Bug #44061 comment 7. Maybe we can drop that as well and finally revert to the original version from Debian?

# SELECT * FROM binpkg WHERE major=5 AND site='apt' AND srcpkg='plymouth';
         binpkg         |            binver             | arch  |  srcpkg  |            srcver             | major | minor | patch | scope | site | maintained |    id    
------------------------+-------------------------------+-------+----------+-------------------------------+-------+-------+-------+-------+------+------------+----------
 libplymouth-dev        | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107008
 libplymouth4-dbgsym    | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107009
 libplymouth4           | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107010
 plymouth-dbgsym        | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107011
 plymouth-label-dbgsym  | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107012
 plymouth-label         | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107013
 plymouth-themes-dbgsym | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107014
 plymouth-themes        | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107015
 plymouth-x11-dbgsym    | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107016
 plymouth-x11           | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107017
 plymouth               | 0.9.4-1.1A~5.0.0.202006141350 | amd64 | plymouth | 0.9.4-1.1A~5.0.0.202006141350 |     5 |     0 |     0 |       | apt  |            | 18107018
(11 Zeilen)
OK: dchdiff -l 1 amd64/plymouth_0.9.4-1.1A~5.0.0.202006141350_amd64.deb
Comment 4 Jürn Brodersen univentionstaff 2020-06-15 11:59:36 CEST
`081-welcome-screen-only-works-with-fb.quilt` is still needed, at least I haven't found an alternative.

The problem is that plymouth uses the drm rendering backend instead of the frame-buffer one, if available. In that case the welcome screen is cleared the moment plymouth quits, which we do not want. The welcome screen should only be cleared after the user presses a key, this only works with the frame-buffer backend.

Sadly plymouth is quite resource hungry [1] and we can't just let it run.

[1]
https://bugs.launchpad.net/ubuntu/+source/plymouth/+bug/1766095
Comment 5 Florian Best univentionstaff 2021-05-25 16:02:24 CEST
UCS 5.0 has been released:
 https://docs.software-univention.de/release-notes-5.0-0-en.html
 https://docs.software-univention.de/release-notes-5.0-0-de.html

If this error occurs again, please use "Clone This Bug".