From b3477234455a555917365b6b4961004e2361c57f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 27 May 2020 23:04:48 +0200
Subject: vm: 'expression->derivation-in-linux-vm' always returns a native
 build.

* gnu/system/vm.scm (expression->derivation-in-linux-vm): Remove #:target.
[builder]: Use #+.  Don't pass #:target-arm32? and #:target-aarch64? to
'load-in-linux-vm'.
Pass #:target #f to 'gexp->derivation'.
(qemu-image): Adjust accordingly.
* gnu/build/vm.scm (load-in-linux-vm): Remove #:target-aarch64?
and #:target-arm32?.  Define them as local variables.
---
 gnu/build/vm.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'gnu/build/vm.scm')

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 433b5a7e8d..0f0ceae18f 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -84,8 +84,6 @@
                            linux initrd
                            make-disk-image?
                            single-file-output?
-                           target-arm32?
-                           target-aarch64?
                            (disk-image-size (* 100 (expt 2 20)))
                            (disk-image-format "qcow2")
                            (references-graphs '()))
@@ -101,7 +99,14 @@ access it via /dev/hda.
 REFERENCES-GRAPHS can specify a list of reference-graph files as produced by
 the #:references-graphs parameter of 'derivation'."
 
-  (define target-arm? (or target-arm32? target-aarch64?))
+  (define target-arm32?
+    (string-prefix? "arm-" %host-type))
+
+  (define target-aarch64?
+    (string-prefix? "aarch64-" %host-type))
+
+  (define target-arm?
+    (or target-arm32? target-aarch64?))
 
   (define arch-specific-flags
     `(;; On ARM, a machine has to be specified. Use "virt" machine to avoid
-- 
cgit v1.2.3

ion>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d991b0566433b0ff78dd92165430da2f40fe721d'>root</a>/<a href='/guix/log/gnu?id=d991b0566433b0ff78dd92165430da2f40fe721d'>gnu</a>/<a href='/guix/log/gnu/services.scm?id=d991b0566433b0ff78dd92165430da2f40fe721d'>services.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services.scm?id=d991b0566433b0ff78dd92165430da2f40fe721d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-10-12 17:51:41 +0200'>2017-10-12</span></td><td><a href='/guix/commit/gnu/services.scm?id=aad8a143000600abec5c8ebfadec4c09f34f1b73'>services: cleanup: Remove Shadow lock files from /etc.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-09-22 00:05:08 +0200'>2017-09-22</span></td><td><a href='/guix/commit/gnu/services.scm?id=94d2a25091dc4bcaec319c46da96d588e3e63476'>services: network-manager: Add support for VPN plug-ins.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-09-16 17:47:46 +0200'>2017-09-16</span></td><td><a href='/guix/commit/gnu/services.scm?id=0c0c1b21d959a9761a247309428c64a92c599fb3'>services: Add 'fold-service-types'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-09-16 17:47:46 +0200'>2017-09-16</span></td><td><a href='/guix/commit/gnu/services.scm?id=b714395a39fffc60f75408504a23dfe27ad13fc2'>services: Add a description and location for each service type.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-07-11 00:48:50 +0200'>2017-07-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=638e9deaf8926f02cb7ee861914b8eee5a3463a3'>services: Make error message less scary.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-03 16:16:17 +0200'>2017-05-03</span></td><td><a href='/guix/commit/gnu/services.scm?id=69daee23af49aeafcb1d250c90860f9253da719e'>ui: Rename '_' to 'G_'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-04-16 00:48:08 +0200'>2017-04-16</span></td><td><a href='/guix/commit/gnu/services.scm?id=1bb895eabf74a1e571887eb1521915e668a5c28d'>services: Service types can now specify a default value for instances.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-04-16 00:48:07 +0200'>2017-04-16</span></td><td><a href='/guix/commit/gnu/services.scm?id=efe7d19a9edafb793dca21dcefce89ead3465030'>services: 'service-parameters' becomes 'service-value'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-04-13 00:12:42 +0200'>2017-04-13</span></td><td><a href='/guix/commit/gnu/services.scm?id=6ddf4fcfaeff8c9c1c6bd43c172ca33fe6d62c73'>services: Define '%linux-bare-metal-service' using 'simple-service'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-03-10 14:48:06 +0100'>2017-03-10</span></td><td><a href='/guix/commit/gnu/services.scm?id=fe2b6434f02c8abb26aebb59c4e0d0ccacb4fc90'>services: Create /var/log upon activation.</a><span class='msg-avail'>...</span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2017-02-08 16:17:05 +0100'>2017-02-08</span></td><td><a href='/guix/commit/gnu/services.scm?id=387e175492f960d7d86f34f3b2e43938fa72dbf3'>services: Add 'special-files-service-type'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-01-24 00:46:37 +0100'>2017-01-24</span></td><td><a href='/guix/commit/gnu/services.scm?id=2986995b85e76f12741fcdda8dd0e1a636620dec'>services: Create /var/log/wtmp upon activation.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-01-19 23:45:11 +0100'>2017-01-19</span></td><td><a href='/guix/commit/gnu/services.scm?id=caa7816673ba110d2192c2f4a8b985a475aa08a2'>services: Create /var/run/utmpx upon activation.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-01-16 11:03:26 +0100'>2017-01-16</span></td><td><a href='/guix/commit/gnu/services.scm?id=7d8b59139a5adeaed3f72b4e5e4749a13a77300b'>services: Export 'service-extension' procedures.</a><span class='msg-avail'>...</span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2016-12-11 09:31:34 +0100'>2016-12-11</span></td><td><a href='/guix/commit/gnu/services.scm?id=97bb1ab66519736afbdab57c230c3a9deef2fa05'>services: Activate system prior to services.</a><span class='msg-avail'>...</span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2016-09-20 22:42:11 +0900'>2016-09-20</span></td><td><a href='/guix/commit/gnu/services.scm?id=232ccbefc05aa7fbd3ea8b8f71a65bafc178a28a'>services: Use 'source-module-closure' for (gnu build activation).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-09-19 23:11:19 +0900'>2016-09-19</span></td><td><a href='/guix/commit/gnu/services.scm?id=71654dfdda4890d7a663a36a7fe754b53591aba6'>services: Add 'simple-service'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>