From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UH7uOJrC12EffAAAgWs5BA (envelope-from ) for ; Fri, 07 Jan 2022 05:33:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id cGyTNZrC12FWYAEAauVa8A (envelope-from ) for ; Fri, 07 Jan 2022 05:33:30 +0100 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 595A63BEBB for ; Fri, 7 Jan 2022 05:33:30 +0100 (CET) Received: from localhost ([::1]:51256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5gwT-00028u-Hw for larch@yhetil.org; Thu, 06 Jan 2022 23:33:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5gw2-00027R-Hr for bug-guix@gnu.org; Thu, 06 Jan 2022 23:33:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5gw2-0006ln-9G for bug-guix@gnu.org; Thu, 06 Jan 2022 23:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5gw1-0001FZ-PW for bug-guix@gnu.org; Thu, 06 Jan 2022 23:33:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#52908: 'tests/guix-system.sh' fails on aarch64-linux Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 07 Jan 2022 04:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52908 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Aiko Kyle Received: via spool by 52908-submit@debbugs.gnu.org id=B52908.16415299644779 (code B ref 52908); Fri, 07 Jan 2022 04:33:01 +0000 Received: (at 52908) by debbugs.gnu.org; 7 Jan 2022 04:32:44 +0000 Received: from localhost ([127.0.0.1]:42777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5gvj-0001F1-QX for submit@debbugs.gnu.org; Thu, 06 Jan 2022 23:32:44 -0500 Received: from mail-pf1-f169.google.com ([209.85.210.169]:45843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5gva-0001Ec-CD for 52908@debbugs.gnu.org; Thu, 06 Jan 2022 23:32:43 -0500 Received: by mail-pf1-f169.google.com with SMTP id u20so4175383pfi.12 for <52908@debbugs.gnu.org>; Thu, 06 Jan 2022 20:32:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=qB6a1EM/yylnOEsGJn3wQBBpF7RyApyll2qNCBSHY/8=; b=XFwiPOZoMqMXMNilRJieShmJTIULxKfxBmFvkqkkgqwrEZI8j5Zuy6Z8JTN7qvZ3BR axArXLGwFvUdDaoaTAofqwaBb3iqS5NKFNvndiUGMBRZMHFXigQFaZ0XQhwld8m/R1Kr sDKwYldsf36K8EYzPvKdGIxV9kBcIpslKQRMd7wsVRgLiZZ5+G7MIUKIgOkJhOPDH4qF Z/B7N8ali7ernfDN6Gn+supKYa5pyjCN/dBXJ1E2LKlAJeqNQlmBg4bpLEQFz7Bbv/W+ Hv2bvt5BHXnN33R5W09DZglf/glbOa4b3B1/lSudeDf10u8rwYq78jA89tvBBjxP8D9x 2QRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=qB6a1EM/yylnOEsGJn3wQBBpF7RyApyll2qNCBSHY/8=; b=qoKdbyIureKOi/Q1art2rHu2MkJpXV2N815LyD0G0xi5lBBg2njtfbYvy7DV0111jW m9OtmpToc9T63ezA+9VqBTpHPcJKXbvnecXJSYLA3zhDqoeU8DWcY2ZHsjtEJZipEgym NBWsZWWRhT7tuMQSlE+O9BKJXNRvhjoL0+zll2XhiW/yxsc+3CEEgUwvFmN2CzwsQbzW DhxCnlleUeIGlV3jpapW/tq2TgA6Y2ccKLByf8uwasf2VWUzv7wmlNxfIlXSdwl8oG55 TfanULBLt8Zes4nMV5dNSPb1zFa9VLWycExCYuJatrrP9KTZb6VnPPCpdsAqE8XVS6lx JE7w== X-Gm-Message-State: AOAM533GW7WHTQk2FuMg/yMzLZKc+BmcC5cjypF0oDVyth0SQ/gO+x8r RwfDDAOqtXx7pTdX8+IPDEo= X-Google-Smtp-Source: ABdhPJzRTQVQNxGRAnswq6ZOD/tPPkLBsWC+AR0edRaiz3Zes+aZnlJAeH5yAYqpLyr+Sg72aYIu3w== X-Received: by 2002:a63:88c6:: with SMTP id l189mr56143769pgd.439.1641529948276; Thu, 06 Jan 2022 20:32:28 -0800 (PST) Received: from garuda-lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id q19sm4008337pfk.83.2022.01.06.20.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jan 2022 20:32:27 -0800 (PST) From: Chris Marusich References: <87wnjgqm93.fsf@gmail.com> <87a6g8es32.fsf@gnu.org> Date: Thu, 06 Jan 2022 20:32:23 -0800 In-Reply-To: <87a6g8es32.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Thu, 06 Jan 2022 17:39:45 +0100") Message-ID: <87h7agmai0.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 52908@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641530010; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=qB6a1EM/yylnOEsGJn3wQBBpF7RyApyll2qNCBSHY/8=; b=l6GDEbKgxMZWI6NCPSIdQPgqVA9P+Vqd5/8NXdM5NR8Ja0ubKTC7nuYU4oC+yjz0+RjynP A43W0m/0mvJ+F8LLfFTd/yPckjzmAaan2dqLCF8Bo5oQiYTNrrQD/OgjFVZr6jwIDhM9IT hnV+EY8vkrBy8lKHsf6WDoXXTG51dmMMiUuDtPNDaCVWTQq4NvfXytwhR+kGdbRY786/Ji mACxZGpzbqifWvuTg9RXN9aXQmHvOIOe+KWN86FK33S+8hLwBUkNw6Qbhggof1sIUDLTRN jVsRQGvoZAsqJyt/8gqNQmrz0lceNXpqAVWyUEc5IXLCN1kpPY2OBOlPTeLBWg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641530010; a=rsa-sha256; cv=none; b=Skw5X7LMuidOwwpFdJ7TajRRnKbt5SamDYsv2AD1iudAOtwkXTZkRka8z7V5K4q8y9I9GV fMxSXyiijulkAiYoppqXT/I7FsHpQQqcOstsm54CtDSt4h1ugS5rqzUJA5Q7p4TMhtTYOo DC58KhOzmye83Zf/18AKFFHDo+KeZYeQ5jjid2+VfxtxtLqEXYaDHEFMwkSkJudka5gfF9 ubWYmVOUgIPrDQvw6xsng7LTSfhI0IyZKwcP/zQwriI5k3V0Thd81c9BTw0CYlOgouZzbS fZ2sHIAdretl0Uz5q7b8zc2uGzWPX48PPOtjKZ2bgTEsrA1LEXc1o8xwLjBWHw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=XFwiPOZo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.40 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=XFwiPOZo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 595A63BEBB X-Spam-Score: -5.40 X-Migadu-Scanner: scn0.migadu.com X-TUID: mo9KvFckxCkC --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo and Aiko, Ludovic Court=C3=A8s writes: > I=E2=80=99d rather not move things and fix the bug in the same commit. (= I=E2=80=99m not > even convinced sddm needs to leave its own module, plus it would break > the API, which is not something to do lightly.) You're right! I was able to avoid moving the (gnu services sddm) module by autoloading it from (gnu services xorg). I've committed the fix as 79260c8695cc5e3cd64f5b01e262369d5a67f141, along with two commits that update the guix package. > Thanks for fixing it! > > And yes, we=E2=80=99ll need to update the =E2=80=98guix=E2=80=99 package = once this fix is in. Thank you for the review! Aiko, can you confirm that after running "guix pull" the issue is resolved on your end, too? =2D-=20 Chris PGP: https://savannah.gnu.org/people/viewgpg.php?user_id=3D106836 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-services-Consistently-use-SDDM-rather-than-GDM-on-no.patch Content-Transfer-Encoding: quoted-printable From=2079260c8695cc5e3cd64f5b01e262369d5a67f141 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Thu, 6 Jan 2022 18:43:47 -0800 Subject: [PATCH] services: Consistently use SDDM rather than GDM on non-x86_64. This is a follow-up to 49599fab564f203b8e92d32e9b28c99e99849bfb. Fixes: . * gnu/services/xorg.scm (set-xorg-configuration)[login-manager-service-type= ]: When the current system or target system begins with the string "x86_64", u= se gdm-service-type as before; otherwise, use sddm-service-type. * gnu/system/examples/vm-image.tmpl (services): Add sddm-service-type to the list of service types to remove. =2D-- gnu/services/xorg.scm | 11 ++++++++++- gnu/system/examples/vm-image.tmpl | 6 +++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 82a7d25602..35f8dbc5f8 100644 =2D-- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -11,6 +11,7 @@ ;;; Copyright =C2=A9 2021 Brice Waegeneire ;;; Copyright =C2=A9 2021 Oleg Pykhalov ;;; Copyright =C2=A9 2021 Josselin Poiret +;;; Copyright =C2=A9 2022 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ ;;; along with GNU Guix. If not, see . =20 (define-module (gnu services xorg) + #:autoload (gnu services sddm) (sddm-service-type) #:use-module (gnu artwork) #:use-module (gnu services) #:use-module (gnu services shepherd) @@ -1040,10 +1042,17 @@ the GNOME desktop environment.") "Run the GNOME Desktop Manager (GDM), a program that al= lows you to log in in a graphical session, whether or not you use GNOME.")))) =20 +;; Since GDM depends on Rust (gdm -> gnome-shell -> gjs -> mozjs -> rust) +;; and Rust is currently unavailable on non-x86_64 platforms, default to +;; SDDM there (FIXME). (define* (set-xorg-configuration config #:optional (login-manager-service-type =2D gdm-service-type)) + (let ((system (or (%current-target-syste= m) + (%current-system)))) + (if (string-prefix? "x86_64" system) + gdm-service-type + sddm-service-type)))) "Tell the log-in manager (of type @var{login-manager-service-type}) to u= se @var{config}, an record." (simple-service 'set-xorg-configuration diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-ima= ge.tmpl index a59d91587b..ccb0b045db 100644 =2D-- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -5,7 +5,7 @@ ;; =20 (use-modules (gnu) (guix) (srfi srfi-1)) =2D(use-service-modules desktop mcron networking spice ssh xorg) +(use-service-modules desktop mcron networking spice ssh xorg sddm) (use-package-modules bootloaders certs fonts nvi package-management wget xorg) =20 @@ -107,12 +107,12 @@ root ALL=3D(ALL) ALL ;; Use the DHCP client service rather than NetworkManager. (service dhcp-client-service-type)) =20 =2D ;; Remove GDM, ModemManager, NetworkManager, and wpa-supplica= nt, =2D ;; which don't make sense in a VM. + ;; Remove some services that don't make sense in a VM. (remove (lambda (service) (let ((type (service-kind service))) (or (memq type (list gdm-service-type + sddm-service-type wpa-supplicant-service-type cups-pk-helper-service-type network-manager-service-type base-commit: c4240dfdb433239108edaf12acb5c51138f9dc74 =2D-=20 2.30.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAmHXwlcVHGNtbWFydXNp Y2hAZ21haWwuY29tAAoJEN1AmhXYIkadtbcP/27B412ECGcUdkiRAXqRryzMWAkZ 5HudQMLXQsOrsi46hrshnNOrd5UL3WlEmAavhdc89BTa5OkzQUeNn50851qq8Bed o4bxpNKCwIssLPtXNddCmLEGZEoKoF7v0IY8q9EvUpBe30VEmmeNOJULQRl8gNvr C4J2/MC/3k3RK0I7hk0yshqcs0ESIyMTXSpzlijoIS5yPIkWIZ0j23OsHbOBOwEG KddMQbZNKA1VX+Ezx+dH8mQic8KYkP63AJ8+m90+IsEhddqhtOXBHsgvcLb1Bmb1 rze2DZ43ZuAnQ2OpS2bMQ59NVrg74NZeE0m6H6AdARlet0WVkMdwOc9JNU9QCP3x nxPE8Y9QNxl4w8L9kA38FznLumHAemcbxO0iQMIrWFLxU/2vb7hbQ3TFxDDiV7dX OxQrFrNaToxxHOpW08K4aboPFnpsgC8rmbnWlC0O5+xIhMVqm7DIP2Abazu3L8GB pg9X+f4/FnI4AXoT/8cjN6lAY32TV3RHp8aAeqJjT4Lfa5cOztRapSGXqzIRlZMg r2jT8z6fNkhNQRsLmzPrlA0FRHjfGIK3WXYEaX1lPQ6ybRVQbrb7OAydMdRDD34L DMpF+iKOBQ/UJrgKk+tnHdQJrA0HT1lYZjZPm43yXFaTQORu5T+EV4Q1KQixSAna P0ETnAwNbepZC2aV =+8/C -----END PGP SIGNATURE----- --==-=-=--