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

Remove messy `device.info` option #152

Merged
merged 48 commits into from May 25, 2020
Merged

Conversation

@samueldr
Copy link
Member

samueldr commented May 23, 2020

Rather, remove unused options, and then add proper options or use existing NixOS options.


This gives us working boot.kernelParams support for stage-1 builds. Configuration can now add and remove to the kernel parameters.

This also reduces the risks of doing something wrong with the untyped mess of options that was present previously.

samueldr added 5 commits May 23, 2020
Instead of borrowing some of its system.build products, rely instead on
a full system.build for the recovery.img.

This allows us to better make use of the implicit declarativeness of the
system configuration. At some point the recovery "system" will be moved
out of that file and things will continue to work.
This is the first step in actually dropping all device information.
@samueldr samueldr marked this pull request as draft May 23, 2020
@samueldr samueldr changed the title Remove messy `device.info` option [WIP] Remove messy `device.info` option May 23, 2020
@samueldr samueldr force-pushed the samueldr-wip:fix/kernel-cmdline branch 2 times, most recently from e61ac27 to 12913af May 24, 2020
@samueldr samueldr marked this pull request as ready for review May 24, 2020
@samueldr samueldr force-pushed the samueldr-wip:fix/kernel-cmdline branch from 12913af to adc157f May 25, 2020
@samueldr samueldr changed the title [WIP] Remove messy `device.info` option Remove messy `device.info` option May 25, 2020
@samueldr
Copy link
Member Author

samueldr commented May 25, 2020

I don't think it's strictly required, but it would be nice to have confirmation that it didn't break those devices I don't own.

It's not a no-op, but functionally, it should end up being the same. (Inputs change a bit, but not in a significant manner.)

@danielfullmer
Copy link
Contributor

danielfullmer commented May 25, 2020

Seems to be working for me. I built a boot.img against this branch using this:

nix-build default.nix --argstr device google-marlin -A build.android-bootimg -I nixpkgs=https://github.com/nixos/nixpkgs/archive/22a3bf9fb9edad917fb6cd1066d58b5e426ee975.tar.gz

I had to use an older nixpkgs since the latest one seems to have an issue with systemd while cross compiling on x86_64-linux. See:
https://hydra.nixos.org/job/mobile-nixos/unstable/tested#tabs-status

@lheckemann
Copy link
Member

lheckemann commented May 25, 2020

Last I checked, xiaomi-tissot wasn't working at all, and I haven't had the time to look into it yet unfortunately. Will have to check it out again sometime soon.

@samueldr samueldr merged commit 7ec5253 into NixOS:master May 25, 2020
3 checks passed
3 checks passed
Parse_nix
Details
Documentation
Details
Instantiation
Details
@samueldr samueldr deleted the samueldr-wip:fix/kernel-cmdline branch May 25, 2020
samueldr added a commit to samueldr-wip/mobile-nixos-wip that referenced this pull request May 26, 2020
samueldr added a commit that referenced this pull request May 26, 2020
bin/menuconfig: Fix breakage caused by #152
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

3 participants
You can’t perform that action at this time.