From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8AxhH6NNyV9rTQAA0tVLHw (envelope-from ) for ; Thu, 03 Dec 2020 20:42:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UKBJG6NNyV9NFQAAbx9fmQ (envelope-from ) for ; Thu, 03 Dec 2020 20:42:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7EC4B940B62 for ; Thu, 3 Dec 2020 20:42:10 +0000 (UTC) Received: from localhost ([::1]:53534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkvQX-0005Pm-Fq for larch@yhetil.org; Thu, 03 Dec 2020 15:42:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkvQQ-0005N0-BJ for guix-patches@gnu.org; Thu, 03 Dec 2020 15:42:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58569) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkvQQ-0004fM-2D for guix-patches@gnu.org; Thu, 03 Dec 2020 15:42:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kkvQQ-00065N-0e for guix-patches@gnu.org; Thu, 03 Dec 2020 15:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45021] [PATCH 1/2] image: Add system field. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Dec 2020 20:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45021 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 45021@debbugs.gnu.org Received: via spool by 45021-submit@debbugs.gnu.org id=B45021.160702809823359 (code B ref 45021); Thu, 03 Dec 2020 20:42:01 +0000 Received: (at 45021) by debbugs.gnu.org; 3 Dec 2020 20:41:38 +0000 Received: from localhost ([127.0.0.1]:41882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkvQ1-00064f-Jx for submit@debbugs.gnu.org; Thu, 03 Dec 2020 15:41:37 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:49572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkvQ0-00064V-9Q for 45021@debbugs.gnu.org; Thu, 03 Dec 2020 15:41:36 -0500 Received: from localhost (80-110-127-97.cgn.dynamic.surfer.at [80.110.127.97]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 379123367DCF; Thu, 3 Dec 2020 21:41:34 +0100 (CET) Date: Thu, 3 Dec 2020 21:41:30 +0100 From: Danny Milosavljevic Message-ID: <20201203214124.796b3651@scratchpost.org> In-Reply-To: <20201203105353.149482-2-othacehe@gnu.org> References: <20201203105353.149482-1-othacehe@gnu.org> <20201203105353.149482-2-othacehe@gnu.org> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Df96F.qVn9QoWKZQrMltc.h"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.38 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 7EC4B940B62 X-Spam-Score: -2.38 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: yM3fUYwpXLXB --Sig_/Df96F.qVn9QoWKZQrMltc.h Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Mathieu, On Thu, 3 Dec 2020 11:53:52 +0100 Mathieu Othacehe wrote: > diff --git a/gnu/image.scm b/gnu/image.scm > index a60d83b175..a56710d540 100644 > --- a/gnu/image.scm > +++ b/gnu/image.scm > @@ -33,6 +33,7 @@ > image > image-name > image-format > + image-system > image-target > image-size > image-operating-system > @@ -613,7 +615,15 @@ it can be used for bootloading." > "Return the derivation of IMAGE. It can be a raw disk-image or an ISO= 9660 > image, depending on IMAGE format." > (define substitutable? (image-substitutable? image)) > - (define target (image-target image)) > + > + ;; The image definition may provide the appropriate "system" architect= ure > + ;; for the image. If we are already running on this system, the image= can > + ;; be built natively. If we are running on a different system, then w= e need > + ;; to cross-compile, using the "target" provided by the image definiti= on. > + (define system (image-system image)) > + (define target (if (eq? system (%current-system)) Should be string=3D? instead of eq?, otherwise it downloads a cross compiler for armhf on armhf. With that change, I tested this patchset on armhf--works fine then. LGTM! --Sig_/Df96F.qVn9QoWKZQrMltc.h Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl/JTXoACgkQ5xo1VCww uqWZsAf/dmvRJ4BEFg/FQIpeAUJcHdIioBmEwB168mwjFB2Dx1xpzcd1wDkJXYs3 A750xCEwcT5huBh85gyehYkffE7ZSkYgkIzdK2l1CToUrwGv1jy3El0tEiEfjC+0 JkRbLXo0Kx+mnmYL+nxBK4cxYLIV1BISPibS1XEwVouG82GGGZswU2rxu2P0yJaM SO8UyvwOvXrvG7BWfgF9K4i8M0kKNnIQDg7w2Z8HJhtbZLWo64KgEPvTscsT8UT2 btVsYkXcc1zN79HDL0tudOXSxccyH/g2GpxB7ud2dzlAJzXJNJsctUkOR2j0UsRu Gyh0Qr/J6G/tINKom/LZuevP1AP/zw== =K14P -----END PGP SIGNATURE----- --Sig_/Df96F.qVn9QoWKZQrMltc.h--