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

Jump to bottom

Enables systemd-boot for ARM + fixes meson cpu families #62178

Merged
merged 3 commits into from May 29, 2019
Merged

Enables systemd-boot for ARM + fixes meson cpu families #62178

merged 3 commits into from May 29, 2019

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented May 28, 2019 •
edited

See #61847 for the original PR.

Targeting staging because the change to meson anyway causes a big rebuild to happen. (I had misled myself in believing that crossFile wouldn't be changed for non-cross, but its value change, thus the environment variable changes too.)

Note about cpu_family:

This adds a lookup table to map between meson cpu families and our cpu names.

Things done
  • ☑️ Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • ☑️ NixOS
    • 🔲 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 nix-review --run "nix-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)
  • ☑️ Assured whether relevant documentation is up to date
  • ☑️ Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from rasendubi May 28, 2019 23:09
@samueldr samueldr changed the title Fixes meson for systemd-boot AArch64 cross-build [WIP] Fixes meson for systemd-boot AArch64 cross-build May 28, 2019
@samueldr
meson: fix cpu_family for aarch64
858076e 
As documented, it should be `aarch64` for AArch64.

 * https://mesonbuild.com/Reference-tables.html#cpu-families

```
 $ nix eval '((import <nixpkgs> {}).pkgsCross.aarch64-multiplatform.stdenv.targetPlatform.parsed.cpu.family)'
"arm"
```

The lookup table will ensure that, at any point, meson does not pick the
wrong family.
@samueldr
meson: Adds more binaries, needed for systemd-boot
418c3e1
@samueldr
systemd: Enables systemd-boot for ARM platforms
cc05815
@samueldr samueldr changed the base branch from master to staging May 28, 2019 23:28
@samueldr samueldr changed the title [WIP] Fixes meson for systemd-boot AArch64 cross-build Enables systemd-boot for ARM + fixes meson cpu families May 28, 2019
@ofborg ofborg bot requested a review from edolstra May 28, 2019 23:44
@samueldr samueldr merged commit 9bc34e3 into NixOS:staging May 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rasendubi rasendubi Awaiting requested review from rasendubi

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@samueldr