Message ID | 20221104015456.1059014-1-bauermann@kolabnow.com |
---|---|
State | New |
Headers | show |
Series | [bug#58576,v2] system: image: Define correct docker image arch when cross building | expand |
Hello Thiago, > * gnu/system/image.scm (system-docker-image) Add ‘image-target’ variable. > [builder]: Pass ‘#:system’ argument to ‘build-docker-image’. Applied as a75deb884468db0ce2c35e23a61f1a14c9be958e. Thanks, Mathieu
Hello Mathieu, Mathieu Othacehe <othacehe@gnu.org> writes: >> * gnu/system/image.scm (system-docker-image) Add ‘image-target’ variable. >> [builder]: Pass ‘#:system’ argument to ‘build-docker-image’. > > Applied as a75deb884468db0ce2c35e23a61f1a14c9be958e. Thank you!
diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 5fc0d55d9a14..f07a4a52174f 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -652,6 +652,8 @@ (define shared-network? shared-network?) (list boot-program))) (substitutable? (image-substitutable? image)) + (image-target (or (%current-target-system) + (nix-system->gnu-triplet))) (register-closures? (has-guix-service-type? os)) (schema (and register-closures? (local-file (search-path %load-path @@ -705,6 +707,7 @@ (define builder #:entry-point '(#$boot-program #$os) #:compressor '(#+(file-append gzip "/bin/gzip") "-9n") #:creation-time (make-time time-utc 0 1) + #:system #$image-target #:transformations `((,image-root -> "")))))))) (computed-file name builder