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

flashrom: switch to Meson build and update deps #80293

Merged
merged 1 commit into from Feb 24, 2020

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Feb 16, 2020

Motivation for this change

New upstream release. Also switches to the Meson build system, and libftdi1 (which I am slowly trying to kill the older version of).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@emilazy
Copy link
Member Author

emilazy commented Feb 16, 2020

@GrahamcOfBorg build flashrom

Testing the expanded platforms list.

@emilazy
Copy link
Member Author

emilazy commented Feb 16, 2020

@GrahamcOfBorg build flashrom

...and again now that I fixed the merge conflict

Edit: oh, I guess I don't have privs for the macOS builders anyway, so someone else would have to test that. But the flashrom homepage claims to support macOS, at least.

@emilazy
Copy link
Member Author

emilazy commented Feb 16, 2020

libflashrom should also now be suitable for upstream consumption by fwupd, cc @jtojnar.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Feb 16, 2020

@GrahamcOfBorg build flashrom

@jtojnar
Copy link
Contributor

jtojnar commented Feb 16, 2020

Does it build on aarch64 now? See #79906 (comment)

Also the commit message should be fixed now that @r-ryantmʼs update was merged.

@emilazy
Copy link
Member Author

emilazy commented Feb 16, 2020

Huh, didn't realize I was beaten by the bot; strange it was merged days ago considering the release was only tagged and announced today.

Removed the pointless enableParallelBuilding line; let's see if it builds on AArch64 now, though I doubt it:

@GrahamcOfBorg build flashrom

@emilazy emilazy changed the title flashrom: 1.1 -> 1.2 flashrom: switch to Meson build and update deps Feb 16, 2020
@emilazy
Copy link
Member Author

emilazy commented Feb 16, 2020

yep, still broken. Added a link to the upstream issue to track it at least.

@lukateras
Copy link
Member

aarch64-linux build is failing because unlike flashrom Makefile, meson.build doesn't feature any platform support checks. Compare:

@lukateras
Copy link
Member

lukateras commented Feb 24, 2020

We could disable pciutils for non-X86 architectures, which works around the issue, but disables too much:

{
  mesonFlags = [
    (lib.optional (!stdenv.isi686 && !stdenv.isx86_64) "-Dpciutils=false")
  ];
}

That said, it's probably better to invest effort into fixing this upstream.

@lukateras lukateras merged commit 76e1d5c into NixOS:master Feb 24, 2020
@emilazy emilazy deleted the flashrom-1.2 branch February 24, 2020 19:32
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