Aarch64 Netboot #32031

grahamc · 2017-11-25T16:37:09Z

Some old patches I've had kicking around, and need to upstream ... :)

Here to clean them up and solicit feedback.

grahamc · 2017-11-25T16:38:51Z

nixos/modules/installer/netboot/netboot.nix

-
-    boot.loader.grub.version = 2;
-
+  config = rec {


I'm going to restore the grub version for not-aarch64-linux.

Shouldn't it also be '2' for aarch64?

Turns out we don't need this, anyway. Defaults to 2.

grahamc · 2017-11-25T16:40:00Z

nixos/modules/installer/netboot/netboot.nix

    # Don't build the GRUB menu builder script, since we don't need it
    # here and it causes a cyclic dependency.
    boot.loader.grub.enable = false;

    # !!! Hack - attributes expected by other modules.
-    system.boot.loader.kernelFile = "bzImage";
-    environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];


I'm going to restore these packages for not aarch64, but I don't think they build on aarch64. I wonder what that means for # !!! Hack - attributes expected by other modules..

git grep kernelTarget already gives the answer to "bzImage", so whatever uses that should be refactored to use kernelTarget.

nixos/modules/system/activation/top-level.nix 32: "${config.system.boot.loader.kernelFile}"; 173: system.boot.loader.kernelFile = mkOption { nixos/modules/installer/cd-dvd/iso-image.nix 269: system.boot.loader.kernelFile = "bzImage"; nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix 85: system.boot.loader.kernelFile = "uImage"; 153: { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile; 154: target = "/boot/" + config.system.boot.loader.kernelFile; nixos/modules/installer/cd-dvd/system-tarball-pc.nix 82: [ { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile; 83: target = "/boot/" + config.system.boot.loader.kernelFile; nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix 139: { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile; 140: target = "/boot/" + config.system.boot.loader.kernelFile; 155: system.boot.loader.kernelFile = "vmlinux"; nixos/modules/installer/netboot/netboot.nix 30: system.boot.loader.kernelFile = if pkgs.stdenv.system == "aarch64-linux" 90: kernel ${system.boot.loader.kernelFile} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nixos/modules/system/boot/loader/generations-dir/generations-dir.nix 62: system.boot.loader.kernelFile = platform.kernelTarget; nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix 46: system.boot.loader.kernelFile = platform.kernelTarget;

I'm not sure I want to take this on in this PR 😅

Eh ... might as well ...

Well you could change it to system.boot.loader.kernelFile = platform.kernelTarget; and call it a day.

As for the packages, grub2_efi ~~should~~ does build on AArch64.

BTW, don't you need to use mkIf to not end up with infinite recursion?

I don't, systemPackages doesn't impact pkgs here. Fixed up the kernelTarget issue, added grub2_efi on aarch64.

grahamc · 2017-11-25T16:45:15Z

nixos/modules/installer/netboot/netboot.nix

-    system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" "#!ipxe\nkernel bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}\ninitrd initrd\nboot";
+    system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
+      #!ipxe
+      kernel ${system.boot.loader.kernelFile} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}


The only thing changing here is bzImage is becoming variable.

grahamc · 2017-11-25T16:45:43Z

nixos/modules/virtualisation/qemu-vm.nix

@@ -442,7 +442,8 @@ in

    virtualisation.pathsInNixDB = [ config.system.build.toplevel ];

-    virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
+    virtualisation.qemu.options = [ "-machine gic-version=host" "-cpu host"
+                                   "-machine virt" "-device virtio-gpu" ];


I'm not sure these are useful, I don't think they ever worked. I plan on removing these changes.

grahamc · 2017-11-25T16:47:02Z

pkgs/applications/virtualization/qemu/default.nix

@@ -81,10 +81,21 @@ stdenv.mkDerivation rec {
      done


I'm not sure these are useful. Thoughts?

grahamc · 2017-11-25T16:47:52Z

pkgs/os-specific/linux/kernel/manual-config.nix

@@ -164,18 +164,15 @@ let
        chmod u+w -R ../source


I think these changes have been incorporated already.

grahamc · 2017-11-25T16:48:22Z

pkgs/top-level/all-packages.nix

@@ -12227,7 +12227,7 @@ with pkgs;
  qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-slim; });
  qemu_xen-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-light; });

-  qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; });
+  qemu_test = lowPrio (qemu.override { x86Only = false; nixosTestRunner = true; });


This might depend on my changes to pkgs/applications/virtualization/qemu/default.nix ... thoughts?

dezgeg · 2017-11-25T17:22:32Z

nixos/release.nix

@@ -126,6 +126,30 @@ in rec {
      '';
    };

+  netboot.aarch64-linux = let build = (import lib/eval-config.nix {


Don't you need to do something special here in case the supportedSystems parameter passed to the file doesn't include aarch64?

grahamc

Ok, other than my one comment this should be good to go.

grahamc · 2017-11-26T00:40:24Z

nixos/release.nix

@@ -1,6 +1,6 @@
 { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" ]
+, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]


I'm not certain we want to do this yet. Thoughts?

grahamc · 2017-11-26T00:43:43Z

Jobset: https://hydra.nixos.org/jobset/nixos/unstable-aarch64

grahamc commented Nov 25, 2017

View reviewed changes

grahamc force-pushed the unstable-aarch64 branch 2 times, most recently from aa55683 to 468c3fb Compare November 25, 2017 16:57

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 10.rebuild-darwin: 0 10.rebuild-linux: 0 and removed 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 labels Nov 25, 2017

dezgeg reviewed Nov 25, 2017

View reviewed changes

grahamc force-pushed the unstable-aarch64 branch from 23d6ccf to 6c8d314 Compare November 26, 2017 00:36

grahamc commented Nov 26, 2017

View reviewed changes

grahamc mentioned this pull request Nov 26, 2017

[tracking] aarch64 build on Packet Type 2A #31606

Closed

grahamc force-pushed the unstable-aarch64 branch from 0ea9e57 to bc9e48d Compare November 27, 2017 12:26

dezgeg force-pushed the unstable-aarch64 branch from bc9e48d to f8e17f5 Compare November 27, 2017 14:07

dezgeg force-pushed the unstable-aarch64 branch from f8e17f5 to ab67fea Compare December 6, 2017 15:34

Netboot: Add aarch64

08b8bc2

grahamc force-pushed the unstable-aarch64 branch from ab67fea to 08b8bc2 Compare December 12, 2017 02:34

grahamc changed the title ~~WIP: assorted aarch64 patches~~ Aarch64 Netboot Dec 12, 2017

grahamc merged commit 3cad1ab into master Dec 12, 2017

grahamc deleted the unstable-aarch64 branch December 12, 2017 22:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Aarch64 Netboot #32031

Aarch64 Netboot #32031

grahamc commented Nov 25, 2017

grahamc Nov 25, 2017

dezgeg Nov 25, 2017

grahamc Nov 25, 2017

grahamc Nov 25, 2017 •

edited

Loading

dezgeg Nov 25, 2017 •

edited by grahamc

Loading

grahamc Nov 25, 2017

grahamc Nov 25, 2017

dezgeg Nov 25, 2017

dezgeg Nov 25, 2017 •

edited

Loading

grahamc Nov 25, 2017

grahamc Nov 25, 2017

grahamc Nov 25, 2017

grahamc Nov 25, 2017

grahamc Nov 25, 2017

grahamc Nov 25, 2017

dezgeg Nov 25, 2017

grahamc Nov 26, 2017

grahamc left a comment

grahamc Nov 26, 2017

grahamc commented Nov 26, 2017

Aarch64 Netboot #32031

Aarch64 Netboot #32031

Conversation

grahamc commented Nov 25, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

grahamc Nov 25, 2017 • edited Loading

Choose a reason for hiding this comment

dezgeg Nov 25, 2017 • edited by grahamc Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dezgeg Nov 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

grahamc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

grahamc commented Nov 26, 2017

grahamc Nov 25, 2017 •

edited

Loading

dezgeg Nov 25, 2017 •

edited by grahamc

Loading

dezgeg Nov 25, 2017 •

edited

Loading