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

WIP: Qubes OS R4.2 related changes #898

Closed
wants to merge 15 commits into from
Closed

WIP: Qubes OS R4.2 related changes #898

wants to merge 15 commits into from

Conversation

eaon
Copy link
Contributor

@eaon eaon commented Jun 5, 2023

Description of Changes

Addresses #884. More TK

Testing

TK

Deployment

TK

Checklist

If you have made changes to the provisioning logic

  • All tests (make test) pass in dom0
  • I have updated MANIFEST.in and rpm-build/SPECS/securedrop-workstation-dom0-config.spec
  • I would appreciate help with the documentation

@eaon
Copy link
Contributor Author

eaon commented Jun 5, 2023

Unfortunately GH doesn't support renaming branches without closing the associated PRs. See #897 (comment) for more context

@eaon eaon force-pushed the skip-ci/884-qubes-4.2 branch from 6468484 to b127b66 Compare June 5, 2023 19:05
@cfm
Copy link
Member

cfm commented Feb 29, 2024

On a fresh Qubes 4.2 installation, the initial make {clone,dev} incantation failed, and I needed to add 9f9d1d3 before it would resume. That's a workaround, not a fix; we'll need to refactor the logic of the qvm-checks there.

@deeplow
Copy link
Contributor

deeplow commented Mar 25, 2024

I was trying to use this branch in order to be able to do make clone on 4.2. That part works. However, I see now that this branch fully removes the launcher..

As we're exploring in #899 that is not entirely the case and there is still relevance for the launcher. So I'd suggest reverting the commit that removed them.

CONTAINER := $(if $(shell grep "Thirty Two" /etc/fedora-release),,./scripts/container.sh)
# We prefer to use python3.11 if it's availabe, as that is the version shipped
# with Fedora 37, but we're also OK with just python3 if that's all we've got
PYTHON3 := $(if $(shell bash -c "command -v python3.11"), python3.8, python3)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
PYTHON3 := $(if $(shell bash -c "command -v python3.11"), python3.8, python3)
PYTHON3 := $(if $(shell bash -c "command -v python3.11"), python3.11, python3)

I think the semantics were lost a bit in the change. We want run a version as close as possible to dom0's (python3.11). What the line is currently saying is: if there's python3.11, run python3.8.

@zenmonkeykstop
Copy link
Contributor

I cherry-picked commits from this branch (dropping the commits that remove the launcher) into a new one a few days back @deeplow, and started updating there for Qubes 4.2.1 - see https://github.com/freedomofpress/securedrop-workstation/tree/4_2-compat-keep-launcher

@zenmonkeykstop
Copy link
Contributor

Leaving this PR as draft for now - once the https://github.com/freedomofpress/securedrop-workstation/tree/4_2-compat-keep-launcher branch is mergeable we can cut a new PR and close this one.

@zenmonkeykstop
Copy link
Contributor

Closing this in favour of #970

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.

5 participants