Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Packaging overhaul #92

Merged
merged 2 commits into from
Feb 4, 2025
Merged

Packaging overhaul #92

merged 2 commits into from
Feb 4, 2025

Conversation

samcday
Copy link
Owner

@samcday samcday commented Feb 2, 2025

closes #70

The resources directory is intended for things that are embedded into,
or otherwise needed by, the main phrog binary.

The data directory is for stuff that should be dropped in the filesystem
somewhere to support phrog at runtime.

Put differently, resources/ is for the build, data/ is for the
packaging scripts.

Signed-off-by: Sam Day <me@samcday.com>

This comment has been minimized.

@samcday samcday force-pushed the packaging-overhaul branch from ce8c8b5 to d282634 Compare February 3, 2025 08:13

This comment has been minimized.

@samcday samcday force-pushed the packaging-overhaul branch from d282634 to 19146fc Compare February 3, 2025 09:06
@samcday
Copy link
Owner Author

samcday commented Feb 3, 2025

/packit build

This comment has been minimized.

@samcday samcday force-pushed the packaging-overhaul branch from 19146fc to a9d3e4d Compare February 3, 2025 11:54

This comment has been minimized.

@samcday
Copy link
Owner Author

samcday commented Feb 3, 2025

/packit build

@samcday samcday force-pushed the packaging-overhaul branch from a9d3e4d to 467d4d2 Compare February 3, 2025 12:29

This comment has been minimized.

@samcday samcday marked this pull request as ready for review February 3, 2025 12:39
@samcday
Copy link
Owner Author

samcday commented Feb 3, 2025

/packit build

@samcday samcday force-pushed the packaging-overhaul branch from 467d4d2 to 5deb159 Compare February 3, 2025 19:02

This comment has been minimized.

@samcday
Copy link
Owner Author

samcday commented Feb 3, 2025

/packit build

Booting a fully-functional phrog greeter session under greetd is a
little complicated. The right way to do it varies by distribution.

This commit introduces prescriptive configuration for Alpine and Fedora.
Eventually Debian will be a first-class citizen here too (when I
finally wrap my head around its packaging/tooling).

Since Alpine already allows the greetd config file to be specified in
/etc/conf.d/greetd, we make use of that.

On Fedora, a distinct phrog.service unit is introduced which conflicts
with greetd's default greetd.service. For now, the only difference this
service has to the default is a --config arg. Later, when we support
Plymouth flicker-free boot, it will also Conflict=plymouth-quit.service
to take over that process (just like gdm.service does).

This commit also introduces the use of gnome-session to run the phrog
shell. This ensures auxiliary services like the gsd-* daemons and an OSK
are present.

Since gnome-session is in place, we also use that to spawn phrog itself.
A mobi.phosh.Phrog.desktop file is now shipped for that.

The phrog-session wrapper example Guido introduced recently is moved to
data/ and shipped in Alpine and Fedora. Since this script is only
intended to be referenced by greetd's default_session.command config, it
goes in /usr/libexec rather than in the PATH. As such the --help and
--version are excised, and the script is made as minimal as possible.

The README is updated and cleaned up a bit to reflect this work.

Signed-off-by: Sam Day <me@samcday.com>
@samcday samcday force-pushed the packaging-overhaul branch from 5deb159 to 7a3199d Compare February 4, 2025 09:15
Copy link

github-actions bot commented Feb 4, 2025

The CI build recorded and generated some videos

Demo video (shown on README and release notes)

accent-colours

keypad-shuffle

simple-flow

trivial-flow

@samcday
Copy link
Owner Author

samcday commented Feb 4, 2025

I've tested the reworked packages across a collection of Fedora/Alpine devices, confirming OSK presence and proper power management. Going to land this now and cut a 0.44 release.

@samcday samcday merged commit e5d45a6 into main Feb 4, 2025
3 checks passed
@samcday samcday mentioned this pull request Feb 4, 2025
@samcday samcday deleted the packaging-overhaul branch February 6, 2025 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Run with gnome-session
1 participant