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

raspberrypi-eeprom: Init at 2020-10-05 #88825

Merged
merged 1 commit into from Oct 20, 2020

Conversation

@dasJ
Copy link
Member

@dasJ dasJ commented May 24, 2020

Motivation for this change

cc @cleverca22

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.
wrapProgram $out/bin/rpi-eeprom-update \
--set FIRMWARE_ROOT $out/share/rpi-eeprom \
--set VCMAILBOX ${raspberrypi-tools}/bin/vcmailbox \
--prefix PATH : "${lib.makeBinPath [ binutils-unwrapped findutils kmod pciutils raspberrypi-tools (placeholder "out") ]}"
Copy link
Contributor

@cleverca22 cleverca22 May 30, 2020

it may help to omit raspberrypi-tools, vl805 and maybe rpi-eeprom-update when targeting x86, since the rpi-eeprom-config script still works on x86, and is useful to have there

version = "unstable-2020-05-15"; # USB boot on the beta channel

src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
rev = "ad18a5b468f787ed37ab62e0a699dabeaa580e27";
sha256 = "sha256-E+Fq7VO+gLbCVAawuYfYxBFGER6nelgR8EHwSnc37GQ=";
};
Copy link
Member

@samueldr samueldr May 30, 2020

I believe we should follow the stable (critical?) channel by default, but most likely we also want to provide a trivial-to-use way to use beta; I'm not sure if it's common to provide an attribute to the derivation like betaChannel and change the source on that attribute.

Though, we should follow the stable channel, that is for sure, we can't have a beta update slip on user's systems if they don't want it.

Copy link
Contributor

@cleverca22 cleverca22 May 31, 2020

the channels on the eeprom are a bit confusing
the latest version for each channel is all in a single git repo, at the same time, with slightly confusing names
i think the one in critical on master, is considered stable and safe for use by anybody

Copy link
Member

@samueldr samueldr May 31, 2020

I see... this could get confusing fast.

I would recommend not putting that comment about USB boot, though possibly a comment stating that we are following the tip of master, which does not mean that the firmware files are unstable.

Though, at the current time, it seems using a tagged release is possible, and might be preferred still, if only to better communicate what is being used?

v2020.05.28-137ad is basically the tip, except for a small QOL change in the eeprom script.

@dasJ dasJ force-pushed the init/rpi-eeprom branch from a10fccb to a14cdd3 Oct 7, 2020
@dasJ
Copy link
Member Author

@dasJ dasJ commented Oct 7, 2020

@cleverca22 @samueldr Is it better this way?

@dasJ dasJ changed the title raspberrypi-eeprom: Init at 2020-05-15 raspberrypi-eeprom: Init at 2020-10-05 Oct 7, 2020
@dasJ dasJ requested review from ajs124 and Lassulus Oct 15, 2020
@dasJ dasJ force-pushed the init/rpi-eeprom branch from a14cdd3 to 9f868b3 Oct 19, 2020
@dasJ dasJ force-pushed the init/rpi-eeprom branch from 9f868b3 to cdabe10 Oct 20, 2020
@ajs124 ajs124 merged commit 038afc6 into NixOS:master Oct 20, 2020
19 checks passed
19 checks passed
@github-actions[bot]
tests
Details
@github-actions[bot]
action
Details
@ofborg[bot]
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions[bot]
Wait for ofborg
Details
@ofborg[bot]
grahamcofborg-eval ^.^!
Details
@ofborg[bot]
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg[bot]
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg[bot]
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cdabe10"; rev="cdabe1007c89cb92aff1b378831784c19873bc07"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg[bot]
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cdabe10"; rev="cdabe1007c89cb92aff1b378831784c19873bc07"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cdabe10"; rev="cdabe1007c89cb92aff1b378831784c19873bc07"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cdabe10"; rev="cdabe1007c89cb92aff1b378831784c19873bc07"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cdabe10"; rev="cdabe1007c89cb92aff1b378831784c19873bc07"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cdabe10"; rev="cdabe1007c89cb92aff1b378831784c19873bc07"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="cdabe10"; rev="cdabe1007c89cb92aff1b378831784c19873bc07"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg[bot]
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ofborg[bot]
raspberrypi-eeprom, raspberrypi-eeprom.passthru.tests on aarch64-linux Success
Details
@ofborg[bot]
raspberrypi-eeprom, raspberrypi-eeprom.passthru.tests on x86_64-linux Success
Details
@ajs124 ajs124 deleted the init/rpi-eeprom branch Oct 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants