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

uboot: 2024.07 -> 2024.10 #347188

Merged
merged 4 commits into from
Oct 12, 2024
Merged

uboot: 2024.07 -> 2024.10 #347188

merged 4 commits into from
Oct 12, 2024

Conversation

jmbaur
Copy link
Contributor

@jmbaur jmbaur commented Oct 7, 2024

Built all boards with the following expression:

let
  pkgs = import ./. { };
  inherit (pkgs) lib;
in

pkgs.linkFarm "uboot-all" (
  lib.mapAttrsToList
    (name: pkg: {
      inherit name;
      path = pkg;
    })
    (
      lib.mapAttrs (
        name: pkg:
        let
          inherit (pkg.meta) platforms;
        in
        if builtins.elem "x86_64-linux" platforms then
          pkgs.${name}
        else if builtins.elem "aarch64-linux" platforms then
          pkgs.pkgsCross.aarch64-multiplatform.${name}
        else if builtins.elem "armv7l-linux" platforms then
          pkgs.pkgsCross.armv7l-hf-multiplatform.${name}
        else if builtins.elem "riscv64-linux" platforms then
          pkgs.pkgsCross.riscv64.${name}
        else if builtins.elem "armv6l-linux" platforms then
          pkgs.pkgsCross.raspberryPi.${name}
        else if builtins.elem "armv5tel-linux" platforms then
          pkgs.pkgsCross.sheevaplug.${name}
        else
          builtins.throw "don't know how to build ${name} on platforms ${toString platforms}"
      ) (lib.filterAttrs (name: _: builtins.match "^uboot.*" name != null) pkgs)
    )
)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested review from lopsided98 and dezgeg October 8, 2024 00:28
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 8, 2024
K900 and others added 3 commits October 8, 2024 17:44
The defconfig for ubootCM3588NAS does not specify building an image for
SPI flash, so remove the attempt to install the non-existent file.
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Oct 8, 2024
@lopsided98
Copy link
Contributor

Tested booting (all cross-compiled):

  • ubootRaspberryPi2: needed to add device tree to firmware partition, this requirement was added in 2024.07.
  • ubootRock64v2
  • ubootRockPro64: needed to reset saved environment to get it to boot properly from a SATA SSD
  • ubootOdroidC2
  • ubootOdroidXU3: loads the correct device tree and Ethernet works, both of which were broken in 2023.07.02, the last version I tested

@K900 K900 merged commit 15f8bd8 into NixOS:master Oct 12, 2024
33 checks passed
@K900
Copy link
Contributor

K900 commented Oct 12, 2024

Let's just merge this so we have more time to test before 24.11.

@jmbaur jmbaur deleted the jbaur/uboot-2024.10 branch October 12, 2024 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants