mesa: fix build for armv5tel#213635
Merged
K900 merged 3 commits intoNixOS:staging-nextfrom Jan 30, 2023
Merged
Conversation
I'm not aware of any ARMv5 EFI implementation. gnu-efi doesn't support it, so the build of systemd for armv5tel-linux is broken if it's isEfi.
ARMv5 does not have hardware floating point, so can't build systemd's BPF code.
Fixes: e7a2c65 ("mesa: reorganize default driver list")
alyssais
added
the
6.topic: systemd
alyssais
requested review from
a team,
Ericson2314,
matthewbauer and
nbp
as code owners
ofborg
bot
added
10.rebuild-darwin: 0
Contributor
|
I wonder why ofborg is seeing a rebuild here. |
Member
Author
IIRC nixos-install-tools pulls in a verbatim copy of lib, so any change to lib now causes a rebuild. :/ |
Member
|
It pulls in nixos-manpages which get rebuild with every module change and the diff is: ...drum sticks playing.... ➜ diffoscope result*
--- result
+++ result-before
├── stat {}
│ @@ -1,7 +1,7 @@
│
│ Size: 76 Blocks: 2 IO Block: 131072 symbolic link
│ Device: 0,31 Access: (0777/lrwxrwxrwx) Uid: ( 1000/ sandro) Gid: ( 100/ users)
│
│ -Modify: 2023-01-30 21:24:49.196166901 +0000
│ +Modify: 2023-01-30 21:23:10.292482912 +0000
│ --- result/share
├── +++ result-before/share
│┄ symlink
│ @@ -1 +1 @@
│ -destination: /nix/store/mr95w917i81bwq17p5gcayvj5i1330wh-nixos-manpages/share
│ +destination: /nix/store/jk09zfw9v0if7kc0jvf8wiiksfk3bkns-nixos-manpages/share
➜ diffoscope /nix/store/jk09zfw9v0if7kc0jvf8wiiksfk3bkns-nixos-manpages/share /nix/store/mr95w917i81bwq17p5gcayvj5i1330wh-nixos-manpages/share
➜ |
SuperSandro2000
approved these changes
Jan 30, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
I went a bit overboard and decided to test cross builds of #213158 for every non-Darwin entry in
lib.platforms.mesaPlatforms. Everything was fine apart from a regression on armv5tel with a simple fix, but then the final commit was pushed adding a systemd dependency, so then I had to fix the build of systemd for armv5tel as well.The particular ARMv5 quirks we have to take into account for systemd and mesa are:
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes