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

dtc: add yaml support and enable tests #118700

Merged
merged 3 commits into from
Apr 9, 2021
Merged

Conversation

tnias
Copy link
Contributor

@tnias tnias commented Apr 6, 2021

Motivation for this change

I noticed dtc has yaml support, but this was not avaiable in the nixpkgs version. Getting the feature is as easy as providing the correct library at compiletime.

Things done

Set libyaml as a buildInput. Make sure tests of the dtc project run.

  • 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.

@r-rmcgibbo
Copy link

r-rmcgibbo commented Apr 6, 2021

Result of nixpkgs-review pr 118700 at a8ddf1dd run on aarch64-linux 1

1 package marked as broken and skipped:
  • odroid-xu3-bootloader
1 package failed to build:
1 package skipped due to time constraints:
  • ubootRockPro64
24 packages built successfully:
  • bareboxTools
  • cloud-hypervisor
  • diffoscope
  • dtc
  • fwts
  • python38Packages.libfdt
  • python39Packages.libfdt
  • spike
  • ubootBananaPim64
  • ubootNanoPCT4
  • ubootOdroidC2
  • ubootOrangePiZeroPlus2H5
  • ubootPine64
  • ubootPine64LTS
  • ubootPinebook
  • ubootPinebookPro
  • ubootQemuAarch64
  • ubootROCPCRK3399
  • ubootRaspberryPi3_64bit
  • ubootRaspberryPi4_64bit
  • ubootRock64
  • ubootRockPi4
  • ubootSopine
  • ubootTools

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement.


Result of nixpkgs-review pr 118700 at a8ddf1dd run on x86_64-linux 1

1 package marked as broken and skipped:
  • odroid-xu3-bootloader
1 package failed to build:
8 packages built successfully:
  • bareboxTools
  • diffoscope
  • dtc
  • fwts
  • python38Packages.libfdt
  • python39Packages.libfdt
  • spike
  • ubootTools
1 suggestion:
  • warning: unclear-gpl

    gpl2 is a deprecated license, please check if project uses gpl2Plus or gpl2Only and change meta.license accordingly.

    Near pkgs/development/compilers/dtc/default.nix:30:5:

       |
    30 |     license = licenses.gpl2; # dtc itself is GPLv2, libfdt is dual GPL/BSD
       |     ^
    

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement.

Support for yaml is disabled, if the pkg-config is not able to locate
yaml.
@bbjubjub2494
Copy link
Member

crosvm is fixed. Can you check if upstream allows later versions of the GPL and clarify metadata accordingly?

Result of nixpkgs-review pr 118700 1

1 package marked as broken and skipped:
  • odroid-xu3-bootloader
9 packages built:
  • bareboxTools
  • crosvm
  • diffoscope
  • dtc
  • fwts
  • python38Packages.libfdt
  • python39Packages.libfdt
  • spike
  • ubootTools

@tnias
Copy link
Contributor Author

tnias commented Apr 8, 2021

@lourkeur: Can you check if upstream allows later versions of the GPL and clarify metadata accordingly?

Upstream says SPDX-License-Identifier: GPL-2.0-or-later. I updated the metadata accordingly.

Copy link
Member

@bbjubjub2494 bbjubjub2494 left a comment

Choose a reason for hiding this comment

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

nice! LGTM

@SuperSandro2000 SuperSandro2000 merged commit 01cf5e4 into NixOS:master Apr 9, 2021
cideM pushed a commit to cideM/nixpkgs that referenced this pull request Apr 9, 2021
@sequencer
Copy link
Contributor

In Apple M1(darwin-aarch64),
check failed to pass with errors below, seems to be an upstream issue.

tests/trees.S:216:8: error: expected relocatable expression
 .byte ((ovf_size_strings_end - ovf_size_strings) >> 24) & 0xff ; .byte ((ovf_size_strings_end - ovf_size_strings) >> 16) & 0xff ; .byte ((ovf_size_strings_end - ovf_size_strings) >> 8) & 0xff ; .byte (ovf_size_strings_end - ovf_size_strings) & 0xff ;
       ^
tests/trees.S:217:8: error: expected relocatable expression
 .byte ((ovf_size_strings_struct - ovf_size_strings) >> 24) & 0xff ; .byte ((ovf_size_strings_struct - ovf_size_strings) >> 16) & 0xff ; .byte ((ovf_size_strings_struct - ovf_size_strings) >> 8) & 0xff ; .byte (ovf_size_strings_struct - ovf_size_strings) & 0xff ;
       ^
tests/trees.S:218:8: error: expected relocatable expression
 .byte ((ovf_size_strings_strings - ovf_size_strings) >> 24) & 0xff ; .byte ((ovf_size_strings_strings - ovf_size_strings) >> 16) & 0xff ; .byte ((ovf_size_strings_strings - ovf_size_strings) >> 8) & 0xff ; .byte (ovf_size_strings_strings - ovf_size_strings) & 0xff ;
       ^
tests/trees.S:219:8: error: expected relocatable expression
 .byte ((ovf_size_strings_rsvmap - ovf_size_strings) >> 24) & 0xff ; .byte ((ovf_size_strings_rsvmap - ovf_size_strings) >> 16) & 0xff ; .byte ((ovf_size_strings_rsvmap - ovf_size_strings) >> 8) & 0xff ; .byte (ovf_size_strings_rsvmap - ovf_size_strings) & 0xff ;
       ^
tests/trees.S:224:8: error: expected relocatable expression
 .byte ((ovf_size_strings_struct_end - ovf_size_strings_struct) >> 24) & 0xff ; .byte ((ovf_size_strings_struct_end - ovf_size_strings_struct) >> 16) & 0xff ; .byte ((ovf_size_strings_struct_end - ovf_size_strings_struct) >> 8) & 0xff ; .byte (ovf_size_strings_struct_end - ovf_size_strings_struct) & 0xff ;
       ^
make: *** [Makefile:349: tests/trees.o] Error 1

@tnias tnias mentioned this pull request Jul 24, 2021
11 tasks
tnias added a commit to tnias/nixpkgs that referenced this pull request Jul 24, 2021
The tests fail on darwin aarch64.

NixOS#118700 (comment)

Reported-by: Jiuyang Liu (sequencer)
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

5 participants