Merge ~aleasto/ubuntu/+source/plymouth:logo into ubuntu/+source/plymouth:ubuntu/devel

[Alessandro Astone]

[Daniel van Vugt (vanvugt)]

Seems Plymouth only has PNG decoding support. But can we auto-generate the latest PNG from the SVG in base-files at build time (or install time)?

review: Needs Information

[Alessandro Astone (aleasto)]

FWIW base-files also still ships a PNG version of the logo.

[Daniel van Vugt (vanvugt)]

Assuming base-files' PNG is up to date then I think we would like to start using that instead of making Plymouth the owner of the image. That way future logo changes only need to modify one package (again).

[Alessandro Astone (aleasto)]

Yeah I agree. There are a couple of options:

* Copy the file from base-files into the plymouth package at build time (plymouth needs a rebuild whenever the logo changes again)
* Copy the file from base-files in plymouth.postinst (plymouth still needs an update whenever the logo changes to re-trigger the postinst script -- I also don't particularly like having files not tracked by dpkg)
* Statically symlink the file from base-files into the plymouth package (need to ensure that the initramfs hook can resolve the symlink and write a regular file)
* Make the plymouth initramfs hook copy the file from base-files into initramfs directly

I think I would like to try the last option in that list

[Daniel van Vugt (vanvugt)]

Yes I think the last one sounds best. All options probably need a new dependency on base-files.

[Alessandro Astone (aleasto)]

Configured plymouth to use /usr/share/pixmaps/ubuntu-logo-text-dark.png directly. Added symlinks where necessary, e.g. watermark.png for the default theme.

Did not add a dependency on base-files because lintian complains that it's not necessary: build-depends-on-essential-package-without-using-version

Verified working for both the boot splash (that is plymouth running from initramfs) and the shutdown splash (that is plymouth running from the root fs)

[Daniel van Vugt (vanvugt)]

Updated diff comments....

[Alessandro Astone (aleasto)]

Rebased

[Daniel van Vugt (vanvugt)]

Sorry about the build time/install time misunderstanding.

In an effort to hurry this up and unblock it I tried to build and install it. But installation is failing on Resolute:

dpkg: regarding plymouth-theme-spinner_24.004.60+git20250831.4a3c171d-0ubuntu4_amd64.deb containing plymouth-theme-spinner:
 plymouth-theme-spinner breaks plymouth (<< 24.004.60+git20250831.4a3c171d-0ubuntu4)
  plymouth (version 24.004.60+git20250831.4a3c171d-0ubuntu3) is present and installed.

dpkg: error processing archive plymouth-theme-spinner_24.004.60+git20250831.4a3c171d-0ubuntu4_amd64.deb (--install):
 installing plymouth-theme-spinner would break plymouth, and
 deconfiguration is not permitted (--auto-deconfigure might help)

review: Needs Fixing

[Alessandro Astone (aleasto)]

> In an effort to hurry this up and unblock it I tried to build and install it.
> But installation is failing on Resolute:
>
> dpkg: regarding plymouth-theme-
> spinner_24.004.60+git20250831.4a3c171d-0ubuntu4_amd64.deb containing plymouth-
> theme-spinner:
> plymouth-theme-spinner breaks plymouth (<<
> 24.004.60+git20250831.4a3c171d-0ubuntu4)
> plymouth (version 24.004.60+git20250831.4a3c171d-0ubuntu3) is present and
> installed.
>
> dpkg: error processing archive plymouth-theme-
> spinner_24.004.60+git20250831.4a3c171d-0ubuntu4_amd64.deb (--install):
> installing plymouth-theme-spinner would break plymouth, and
> deconfiguration is not permitted (--auto-deconfigure might help)

Works for me. Are you requesting install of all binary packages (namely both `plymouth` and `plymouth-theme-spinner`)?
E.g.: sudo apt install --only-upgrade ../plymouth_24.004.60+git20250831.4a3c171d-0ubuntu4_amd64.changes

[Daniel van Vugt (vanvugt)]

I requested install of the packages already installed. From the Bash history (reformatted for readability):

sudo dpkg -i \
  libplymouth5_24.004.60+git20250831.4a3c171d-0ubuntu4_amd64.deb \
  plymouth-label_24.004.60+git20250831.4a3c171d-0ubuntu4_amd64.deb \
  plymouth-theme-spinner_24.004.60+git20250831.4a3c171d-0ubuntu4_amd64.deb \
  plymouth-theme-ubuntu-text_24.004.60+git20250831.4a3c171d-0ubuntu4_amd64.deb \
  plymouth_24.004.60+git20250831.4a3c171d-0ubuntu4_amd64.deb

Maybe you can spot a mistake?

[Alessandro Astone (aleasto)]

Ah, you're invoking dpkg directly. You'll need to specify `--auto-deconfigure` as suggested or use APT instead.

[Daniel van Vugt (vanvugt)]

OK I don't need to block this but also don't have time to confirm it's correct today.

review: Abstain

[Simon Johnsson (bamf0)]

Minor comments, looks good to me, and builds successfully on Resolute for me. Is there a bug related to this MP?

review: Approve

[Daniel van Vugt (vanvugt)]

There's no launchpad bug. I keep forgetting to create one. The idea is to make Plymouth use the new logo that the login screen is now using in Resolute so they match more often. It's tracked internally in https://warthogs.atlassian.net/browse/UDENG-8528

[Simon Johnsson (bamf0)]

I tested out the build on the latest Resolute daily ISO and the boot logo looks good in Plymouth! Version 24.004.60+git20250831.4a3c171d-0ubuntu4 is currently attempting a migration so this branch needs to be rebased on to that.

[Alessandro Astone (aleasto)]

Rebased

[Simon Johnsson (bamf0)]

review: Approve

[Sebastien Bacher (seb128)]

Thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 8eeb53b..8e1bd2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plymouth (24.004.60+git20250831.4a3c171d-0ubuntu5) resolute; urgency=medium
+
+  * Move themes/spinner/watermark.png to the spinner package
+  * Use Ubuntu logo from base-files
+
+ -- Alessandro Astone <[e-mail]>  Thu, 22 Jan 2026 14:48:08 +0100
+
 plymouth (24.004.60+git20250831.4a3c171d-0ubuntu4) resolute; urgency=medium
 
   * d/p/toggle-password.patch: Add TAB toggle hint for password
diff --git a/debian/control b/debian/control
index 49264d5..167320b 100644
--- a/debian/control
+++ b/debian/control
@@ -202,8 +202,10 @@ Depends:
  plymouth (= ${binary:Version}),
  plymouth-label (= ${binary:Version}),
  lsb-release,
-Breaks: plymouth-themes (<< 0.9.4git20190712-0ubuntu1~)
-Replaces: plymouth-themes (<< 0.9.4git20190712-0ubuntu1~)
+Breaks: plymouth-themes (<< 0.9.4git20190712-0ubuntu1~),
+        plymouth (<< 24.004.60+git20250831.4a3c171d-0ubuntu4),
+Replaces: plymouth-themes (<< 0.9.4git20190712-0ubuntu1~),
+          plymouth (<< 24.004.60+git20250831.4a3c171d-0ubuntu4),
 Provides: plymouth-theme,
 Description: boot animation, logger and I/O multiplexer - spinner theme
  Plymouth provides a boot-time I/O multiplexing framework - the most obvious
diff --git a/debian/local/plymouth.hook b/debian/local/plymouth.hook
index f618944..a70e009 100644
--- a/debian/local/plymouth.hook
+++ b/debian/local/plymouth.hook
@@ -121,9 +121,9 @@ case "${THEME_NAME}" in
 		;;
 
 	*)
-		if [ -d ${DESTDIR}/usr/share/plymouth/themes/spinner ]; then
-			cp /usr/share/plymouth/themes/spinner/watermark.png "${DESTDIR}/usr/share/plymouth/themes/spinner/watermark.png"
-		fi
+		# logo from base-files
+		mkdir -p "${DESTDIR}/usr/share/pixmaps"
+		cp -a /usr/share/pixmaps/ubuntu-logo-text-dark.png "${DESTDIR}/usr/share/pixmaps"
 
 		# fontconfig
 		mkdir -p "${DESTDIR}/etc/fonts/conf.d"
diff --git a/debian/local/ubuntu-logo.png b/debian/local/ubuntu-logo.png
deleted file mode 100644
index 64263af..0000000
Binary files a/debian/local/ubuntu-logo.png and /dev/null differ
diff --git a/debian/patches/series b/debian/patches/series
index 85f7c53..77fef5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,6 @@ ubuntu-spinner-style.patch
 ubuntu-spinner-fsck.patch
 plymouth-switch-root-initramfs-Preload-text-renderin.patch
 ubuntu-text.patch
-spinfinity-no-meson-symlink.patch
 remove-plymouth-set-default-theme-populate-initrd.patch
 include-necessary-files.patch
 enable-usesimpledrm.patch
diff --git a/debian/patches/spinfinity-no-meson-symlink.patch b/debian/patches/spinfinity-no-meson-symlink.patch
deleted file mode 100644
index bb6e5fa..0000000
--- a/debian/patches/spinfinity-no-meson-symlink.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Agathe Porte <[e-mail]>
-Date: Tue, 2 Jan 2024 15:37:48 +0100
-Subject: spinfinity: do not rely on meson for symlink creation
-
-Meson is currently not able to create broken symlinks, which is required
-when packaging using a PKGBUILDDIR. This is because the created symlink
-will point to a file in /usr/share/plymouth/... but the file will not
-be installed yet in the host file system but only in the prefix (and after
-the meson install anyways).
-
-Upstream issue: https://github.com/mesonbuild/meson/issues/12253
-
-Drop the meson link creation and rely on debian/rules for copying the logo
-for now.
-
-Forwarded: not-needed
----
- themes/spinfinity/meson.build | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/themes/spinfinity/meson.build b/themes/spinfinity/meson.build
-index f48e8e5..5a2050c 100644
---- a/themes/spinfinity/meson.build
-+++ b/themes/spinfinity/meson.build
-@@ -53,8 +53,3 @@ install_data(
-   'throbber-33.png',
-   install_dir: plymouth_theme_path / 'spinfinity',
- )
--
--install_symlink('header-image.png',
--  install_dir: plymouth_theme_path / 'spinfinity',
--  pointing_to: plymouth_logo_file,
--)
diff --git a/debian/plymouth.postinst b/debian/plymouth.postinst
index 5736e8f..cb954af 100644
--- a/debian/plymouth.postinst
+++ b/debian/plymouth.postinst
@@ -3,7 +3,7 @@
 set -e
 
 case "${1}" in
-	configure)
+	configure|triggered)
 		dpkg-trigger update-initramfs
 		;;
 
diff --git a/debian/plymouth.triggers b/debian/plymouth.triggers
new file mode 100644
index 0000000..99ee303
--- /dev/null
+++ b/debian/plymouth.triggers
@@ -0,0 +1 @@
+interest-noawait /usr/share/pixmaps/ubuntu-logo-text-dark.png
diff --git a/debian/rules b/debian/rules
index 1e91077..a2a53d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ override_dh_auto_configure:
 		-Dbackground-color=0x2c001e \
 		-Dbackground-start-color-stop=0x2c001e \
 		-Dbackground-end-color-stop=0x2c001e \
-		-Dlogo=/usr/share/plymouth/ubuntu-logo.png \
+		-Dlogo=/usr/share/pixmaps/ubuntu-logo-text-dark.png \
 		-Drelease-file=/etc/os-release
 
 override_dh_install:
@@ -51,16 +51,7 @@ override_dh_install:
 	cp debian/local/lock.png debian/plymouth-theme-spinner/usr/share/plymouth/themes/spinner
 	cp debian/local/keyboard.png debian/plymouth-theme-spinner/usr/share/plymouth/themes/spinner
 	cp debian/local/bgrt-fallback.png debian/plymouth-theme-spinner/usr/share/plymouth/themes/spinner
-
-
-override_dh_auto_install:
-
-	# Workaround a but in meson, it cannot create a symlink if the target doesn't exist
-	# https://github.com/mesonbuild/meson/issues/12253
-	install -D -m 0644 debian/local/ubuntu-logo.png debian/plymouth/usr/share/plymouth/ubuntu-logo.png
-	install -D -m 0644 debian/local/ubuntu-logo.png debian/plymouth/usr/share/plymouth/themes/spinner/watermark.png
-	install -D -m 0644 debian/local/ubuntu-logo.png debian/plymouth-themes/usr/share/plymouth/themes/spinfinity/header-image.png
-	dh_auto_install
+	ln -s ../../../pixmaps/ubuntu-logo-text-dark.png debian/plymouth-theme-spinner/usr/share/plymouth/themes/spinner/watermark.png
 
 # Disable dh_installinitramfs as we are managing this ourself
 override_dh_installinitramfs:
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index ecfd4f5..d7fbefb 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1,5 +1,4 @@
 debian/local/debian-logo.png
-debian/local/ubuntu-logo.png
 debian/local/spinner/animation-0001.png
 debian/local/spinner/animation-0002.png
 debian/local/spinner/animation-0003.png