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

fix: isolate files shared with upstream in supplemental package #25

Open
wants to merge 10 commits into
base: packaging/v1.9-regolith
Choose a base branch
from

Conversation

kgilmer
Copy link
Member

@kgilmer kgilmer commented May 18, 2024

Suggests: xdg-desktop-portal-wlr
Provides: sway
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my opinion this is still required. Many packages have a hard dependency on sway. Without this, the sway session will possibly lose out on much of the sway ecosystem.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just realised that the supplemental package replaces sway.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, the user MUST have EITHER sway OR sway-regolith-supplemental installed. Or this is my intention. LMK if this seems off.

debian/control Outdated
swaybg,
polkitd,
libtrawldb,
sway (>= 1.9) | sway-regolith-supplemental,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the order have an effect? Ideally, sway-regolith-supplimental should be installed in the absence of both packages. Can we ensure that somehow??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. I'm not aware of a way to specify a ranked dependency decl like that.. I'll try an experiement. I'll switch the order and (see if possible to) elevate the priority of our package to see if that effects the package solver. I happen to see this behavior on my dev machine, so the test is pretty simple:

$ sudo apt upgrade 
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Calculating upgrade... Done
The following packages were automatically installed and are no longer required:
  mailcap suckless-tools
Use 'sudo apt autoremove' to remove them.
The following NEW packages will be installed:
  sway wmenu
The following packages have been kept back:
  gir1.2-glib-2.0 gir1.2-glib-2.0-dev libgirepository-2.0-0 libglib2.0-0t64 libglib2.0-0t64:i386 libglib2.0-bin libglib2.0-dev libglib2.0-dev-bin
The following packages will be upgraded:
  sway-regolith

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The sway package's priority (at least in Debian) is optional.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed one of the two seems to have caused the desired change:

The following packages were automatically installed and are no longer required:
  mailcap suckless-tools sway-backgrounds
Use 'sudo apt autoremove' to remove them.
The following NEW packages will be installed:
  sway-regolith-supplemental
The following packages have been kept back:
  gir1.2-glib-2.0 gir1.2-glib-2.0-dev libgirepository-2.0-0 libglib2.0-0t64 libglib2.0-0t64:i386 libglib2.0-bin libglib2.0-dev libglib2.0-dev-bin
The following packages will be upgraded:
  sway-regolith
1 upgraded, 1 newly installed, 0 to remove and 8 not upgraded.

I will back out the Priority change as that's the most "special" and see what shakes out.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing Priority caused sway to return to the top pick. Will keep the Priority. Will test on a vanilla noble system (using quickemu)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seeing inconsistent results between my dev environment and a clean install of noble :/ . Another approach might be to add a Recommends on sway-regolith-supplemental.

@kgilmer
Copy link
Member Author

kgilmer commented May 19, 2024

Latest commit produces consistent happy-path behavior on my dev environment (upgrade) and a fresh instance (both running 24.04 amd64). Not sure if the additional meta packages are worth keeping around. PR ready for review @SoumyaRanjanPatnaik

@kgilmer
Copy link
Member Author

kgilmer commented May 19, 2024

nevermind, the following test failed:

  1. install sway
  2. install regolith-session-sway

expected: apt does not install supplemental package
actual: apt installs supplemental package

…s to Suggests to see if that causes resolver to choose not to uninstall sway when installing session package
@kgilmer
Copy link
Member Author

kgilmer commented May 19, 2024

Latest experiment does not produce desired results. On vanilla install, apt chooses to install neither sway nor sway-regolith-supplemental. 🤷

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.

2 participants