M-Labs
/
nix-servo
3
1
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flake: use the uImage format for not-os #9

Merged
sb10q merged 1 commits from fsagbuya/nix-servo:uimage into master 2023-12-13 17:46:37 +08:00
Conversation 1 Commits 1 Files Changed 1 +6 -1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flake.nix
View File

@ -10,9 +10,15 @@
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import nixpkgs { system = "x86_64-linux"; };
not-os-patches = [ not-os-patches = [
{ {
# Additional systemd options for recent nixpkgs
url = "https://patch-diff.githubusercontent.com/raw/cleverca22/not-os/pull/25.patch"; url = "https://patch-diff.githubusercontent.com/raw/cleverca22/not-os/pull/25.patch";
sha256 = "sha256-QYXdiCdvGLcvLkC2BCIfJfCgW3Hf4meeK0SdU39aSYg="; sha256 = "sha256-QYXdiCdvGLcvLkC2BCIfJfCgW3Hf4meeK0SdU39aSYg=";
} }
{
# U-boot wrapped kernel, initrd and zc706 dtb support
url = "https://patch-diff.githubusercontent.com/raw/cleverca22/not-os/pull/26.patch";
sha256 = "sha256-fupVodnuXDik3+pi0BDlWL+zQROfzlWEz+fthe3JNHE=";
}
]; ];
patched-not-os = pkgs.applyPatches { patched-not-os = pkgs.applyPatches {
name = "not-os-patched"; name = "not-os-patched";
@ -223,7 +229,6 @@
extraModules = [ extraModules = [
"${patched-not-os}/zynq_image.nix" "${patched-not-os}/zynq_image.nix"
]; ];
platform = system: (import nixpkgs { config = {}; }).platforms.armv7l-hf-multiplatform;
system = "x86_64-linux"; system = "x86_64-linux";
crossSystem.system = "armv7l-linux"; crossSystem.system = "armv7l-linux";
sb10q commented 2023-12-13 11:16:16 +08:00
Outdated
Review
Copy Link

Why is this duplicating the code already in not-os?

Why is this duplicating the code already in not-os?
fsagbuya commented 2023-12-13 11:29:04 +08:00
Outdated
Review
Copy Link

I initially thought this was also not needed. However, omitting this part results to:

cp: cannot stat 'arch/arm/boot/uImage': No such file or directory

It appears this is just how the process operates, especially considering how the not-os part is structured in the flake. It seems like this flake and the not-os flake function as separate entities, with each only modifying and building upon the not-os modules.

I initially thought this was also not needed. However, omitting this part results to: ``` cp: cannot stat 'arch/arm/boot/uImage': No such file or directory ``` It appears this is just how the process operates, especially considering how the not-os part is structured in the flake. It seems like this flake and the not-os flake function as separate entities, with each only modifying and building upon the not-os modules.
sb10q commented 2023-12-13 11:31:22 +08:00
Outdated
Review
Copy Link

Most likely you're just doing it wrong and not understanding what is really going on. Read the not-os code carefully.

Most likely you're just doing it wrong and not understanding what is really going on. Read the not-os code carefully.
}); });