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.2.8 → 1.2.10 #67625

Merged
merged 2 commits into from Sep 8, 2019
Merged

fwupd: 1.2.8 → 1.2.10 #67625

merged 2 commits into from Sep 8, 2019

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Aug 28, 2019

Reverts #67000

https://github.com/fwupd/fwupd/blob/1.2.10/data/org.freedesktop.fwupd.metainfo.xml#L35-L81

  • adopt the package
  • libflashrom is disabled by default since it is experimental now.
  • add installed tests to passthru for easier running
  • concretize patchShebags
  • no changes in filesInstalledToEtc

Some manual changes were applied on top of that.
@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 28, 2019

Still building the polkit fix. fwupd builds extremely slow while I am also building #67596.

@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 28, 2019

The issue with the missing PolKit files in the installed tests:

Running test: fwupd/fwupdmgr.test
Getting the list of remotes...
PolicyKit files are missing, see https://github.com/hughsie/fwupd/wiki/PolicyKit-files-are-missing
FAIL: fwupd/fwupdmgr.test (Child process exited with code 1)

is that fwupd now checks for presence of the polkit actions on the system:

https://github.com/fwupd/fwupd/blob/80e02dfe21068125399b8a8cb5cb870b59ccb58c/src/fu-util.c#L2196-L2206

The path is obtained from pkg-config:

https://github.com/fwupd/fwupd/blob/80e02dfe21068125399b8a8cb5cb870b59ccb58c/src/fu-common.c#L1038-L1043

https://github.com/fwupd/fwupd/blob/80e02dfe21068125399b8a8cb5cb870b59ccb58c/meson.build#L166-L170

so we will override it with a environment variable.

It will not affect the installation, since install_dir paths are hard-coded:

https://github.com/fwupd/fwupd/blob/80e02dfe21068125399b8a8cb5cb870b59ccb58c/policy/meson.build#L10

https://github.com/fwupd/fwupd/blob/1.2.10/data/org.freedesktop.fwupd.metainfo.xml#L35-L81

* adopt the package
* libflashrom is disabled by default since it is experimental now.
* add installed tests to passthru for easier running
* concretize patchShebags
* no changes in filesInstalledToEtc
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Changes look good, it builds for me on NixOS (test included).

@worldofpeace
Copy link
Contributor

Note untested on aarch64, as hydra can't build ghc for it.

@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 28, 2019

There will be a new release soon so we might want to wait fwupd/fwupd#1320

@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 28, 2019

I also packaged gnome-firmware-updater: https://github.com/jtojnar/nixpkgs/tree/gnome-firmware-updater
But it is probably not suitable for inclusion yet.

@worldofpeace
Copy link
Contributor

There will be a new release soon so we might want to wait fwupd/fwupd#1320

Sounds fine by me, we should be sure to have it in the release though.

@worldofpeace
Copy link
Contributor

I also packaged gnome-firmware-updater: https://github.com/jtojnar/nixpkgs/tree/gnome-firmware-updater
But it is probably not suitable for inclusion yet.

You mean the tool is still WIP? I'd say the package could probably be committed, just not a part of any release set or module.

@worldofpeace worldofpeace added the 2.status: wait-for-upstream Waiting for upstream fix (or their other action). label Aug 28, 2019
@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 28, 2019

From the blog post:

At the moment it’s a seporate project and binary, as we’re still prototyping the UI and working out what kind of UX we want from a power user tool. It’s mostly complete and a few weeks away from it’s first release. When it does get an official release

@jtojnar jtojnar added this to the 19.09 milestone Aug 28, 2019
@superm1
Copy link

superm1 commented Aug 30, 2019

so we will override it with a environment variable.

If you see a need to override this at runtime, can you please send a PR to look for the new variable? Or are you meaning only in the test suite you'll hardcode to a particular location?

@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 31, 2019

@superm1 we override it at build time. The pkg-config variable works for finding a path to install polkit actions but, due to the way we install global data, polkit needs to look for it in a different path.

@disassembler
Copy link
Member

I'm fine waiting, but we may want to go ahead with this if there isn't a new release by Friday.

@jtojnar
Copy link
Contributor Author

jtojnar commented Sep 8, 2019

Merging as the release still did not happen.

@jtojnar jtojnar merged commit c7f19d7 into NixOS:master Sep 8, 2019
@jtojnar jtojnar deleted the fwupd-1.2.10 branch September 8, 2019 01:42
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

4 participants