diff options
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/image.scm | 3 | ||||
| -rw-r--r-- | gnu/system/images/novena.scm | 6 | ||||
| -rw-r--r-- | gnu/system/images/pine64.scm | 6 | ||||
| -rw-r--r-- | gnu/system/images/pinebook-pro.scm | 9 | ||||
| -rw-r--r-- | gnu/system/images/rock64.scm | 8 |
5 files changed, 22 insertions, 10 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 42c2e6c121..a04363a130 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2020, 2021, 2022 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2022 Pavel Shlyak <p.shlyak@pantherx.org> ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> @@ -784,7 +784,6 @@ it can be used for bootloading." (define* (system-image image) "Return the derivation of IMAGE. It can be a raw disk-image or an ISO9660 image, depending on IMAGE format." - (define substitutable? (image-substitutable? image)) (define platform (image-platform image)) ;; The image platform definition may provide the appropriate "system" diff --git a/gnu/system/images/novena.scm b/gnu/system/images/novena.scm index b9ff6dcfea..810e2bed5f 100644 --- a/gnu/system/images/novena.scm +++ b/gnu/system/images/novena.scm @@ -53,7 +53,11 @@ (define novena-image-type (image-type (name 'novena-raw) - (constructor (cut image-with-os (raw-with-offset-disk-image) <>)))) + (constructor (lambda (os) + (image + (inherit (raw-with-offset-disk-image)) + (operating-system os) + (platform armv7-linux)))))) (define novena-barebones-raw-image (image diff --git a/gnu/system/images/pine64.scm b/gnu/system/images/pine64.scm index 99c4ed6ceb..a2d471b802 100644 --- a/gnu/system/images/pine64.scm +++ b/gnu/system/images/pine64.scm @@ -58,7 +58,11 @@ (define pine64-image-type (image-type (name 'pine64-raw) - (constructor (cut image-with-os (raw-with-offset-disk-image) <>)))) + (constructor (lambda (os) + (image + (inherit (raw-with-offset-disk-image)) + (operating-system os) + (platform aarch64-linux)))))) (define pine64-barebones-raw-image (image diff --git a/gnu/system/images/pinebook-pro.scm b/gnu/system/images/pinebook-pro.scm index 7e8910427e..3a0f3abf1f 100644 --- a/gnu/system/images/pinebook-pro.scm +++ b/gnu/system/images/pinebook-pro.scm @@ -58,9 +58,12 @@ (define pinebook-pro-image-type (image-type (name 'pinebook-pro-raw) - (constructor (cut image-with-os - (raw-with-offset-disk-image (* 9 (expt 2 20))) ;9MiB - <>)))) + (constructor (lambda (os) + (image + (inherit + (raw-with-offset-disk-image (* 9 (expt 2 20)))) ;9MiB + (operating-system os) + (platform aarch64-linux)))))) (define pinebook-pro-barebones-raw-image (image diff --git a/gnu/system/images/rock64.scm b/gnu/system/images/rock64.scm index 68cb65f115..b3dcfc6193 100644 --- a/gnu/system/images/rock64.scm +++ b/gnu/system/images/rock64.scm @@ -54,9 +54,11 @@ (define rock64-image-type (image-type (name 'rock64-raw) - (constructor (cut image-with-os - (raw-with-offset-disk-image (expt 2 24)) - <>)))) + (constructor (lambda (os) + (image + (inherit (raw-with-offset-disk-image (expt 2 24))) + (operating-system os) + (platform aarch64-linux)))))) (define rock64-barebones-raw-image (image |