From c0458011174ece1871ed980b07a092615e1a5d3d Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <othacehe@gnu.org>
Date: Mon, 2 Nov 2020 17:16:05 +0100
Subject: [PATCH] system: image: Introduce arm32-raw image type.

* gnu/system/image.scm (arm32-disk-image, arm32-image-type): New variables.
(arm64-disk-image): Inherit from arm32-disk-image.
(arm64-image-type): Change name to 'arm64-raw.
---
 gnu/system/image.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index bc6610b14c..31bd110d0d 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -66,6 +66,7 @@ (define-module (gnu system image)
 
             efi-disk-image
             iso9660-image
+            arm32-disk-image
             arm64-disk-image
 
             image-with-os
@@ -73,6 +74,7 @@ (define-module (gnu system image)
             qcow2-image-type
             iso-image-type
             uncompressed-iso-image-type
+            arm32-image-type
             arm64-image-type
 
             image-with-label
@@ -126,10 +128,10 @@ (define iso9660-image
            (label "GUIX_IMAGE")
            (flags '(boot)))))))
 
-(define arm64-disk-image
+(define arm32-disk-image
   (image
    (format 'disk-image)
-   (target "aarch64-linux-gnu")
+   (target "arm-linux-gnueabihf")
    (partitions
     (list (partition
            (inherit root-partition)
@@ -138,6 +140,11 @@ (define arm64-disk-image
    ;; fails.
    (volatile-root? #f)))
 
+(define arm64-disk-image
+  (image
+   (inherit arm32-disk-image)
+   (target "aarch64-linux-gnu")))
+
 
 ;;;
 ;;; Images types.
@@ -179,9 +186,14 @@ (define uncompressed-iso-image-type
                   (compression? #f))
                  <>))))
 
+(define arm32-image-type
+  (image-type
+   (name 'arm32-raw)
+   (constructor (cut image-with-os arm32-disk-image <>))))
+
 (define arm64-image-type
   (image-type
-   (name 'arm)
+   (name 'arm64-raw)
    (constructor (cut image-with-os arm64-disk-image <>))))