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

fwupd: 1.7.2 -> 1.7.6 #161935

Merged
merged 3 commits into from
Mar 8, 2022
Merged

fwupd: 1.7.2 -> 1.7.6 #161935

merged 3 commits into from
Mar 8, 2022

Conversation

tomfitzhenry
Copy link
Contributor

@tomfitzhenry tomfitzhenry commented Feb 26, 2022

Motivation for this change

Update fwupd to 1.7.6 to support Pinephone modem firmware upgrades, as described in https://gitlab.com/linux-mobile/tracker/-/issues/11 and https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2760.

I had to update add-option-for-installation-sysconfdir.patch, since the patch no longer successfully applied.

This worked (caveat: NixOS/mobile-nixos#463), and I'm now running the https://github.com/Biktorgj/pinephone_modem_sdk firmware successfully.

fwupd.tests is now passing.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@jtojnar
Copy link
Contributor

jtojnar commented Feb 27, 2022

Looks like more changes are needed according to fwupd.tests:

AssertionError: fwupd package contains the following paths in /etc that are not listed in passthru.filesInstalledToEtc: {'fwupd/msr.conf'}

@tomfitzhenry
Copy link
Contributor Author

Looks like more changes are needed according to fwupd.tests:

Done. I've added fwupd/msr.conf to filesInstalledToEtc.

nix-build -A fwupd.tests continues to fail for other reason, however:

https://pastebin.com/9bCZ741A

Excerpt:

Running test: fwupd/fwupdmgr-p2p.test
Starting P2P daemon...
/nix/store/7mhpzl751n6056vjxb87z3ry1w0g6b2r-fwupd-1.7.6-installedTests/share/installed-tests/fwupd/fwupdmgr-p2p.sh: line 13: /usr/libexec/fwupd/fwupd: No such file or directory
Executing: fwupd/fwupdmgr-p2p.test
Executing: fwupd/fwupdmgr-p2p.test
Executing: fwupd/fwupdmgr-p2p.test

Sadly, fwupd is not installed to bin, so we'll have to replace fwupdmgr-p2p.sh: in nix.

@tomfitzhenry
Copy link
Contributor Author

tomfitzhenry commented Mar 5, 2022

Sadly, fwupd is not installed to bin, so we'll have to replace fwupdmgr-p2p.sh: in nix.

Done. fwupd.tests is now passing.

@jtojnar jtojnar self-assigned this Mar 8, 2022
fwupd/fwupd@5bc5462
attempts to fix the need to patch the redfish test ourselves.
But it is actually not sufficient since we install the installed tests
into a separate prefix, so we need to adjust the installed tests patch.
@jtojnar jtojnar removed their assignment Mar 8, 2022
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Picked the upstream patch for the FHS path and also for the redfish tests. Looks good to me now.

@ofborg ofborg bot requested a review from jtojnar March 8, 2022 17:03
@jtojnar jtojnar merged commit 8b250c5 into NixOS:master Mar 8, 2022
@jtojnar jtojnar mentioned this pull request Apr 25, 2022
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants