From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id QHz4HW+PKmXnDgAAauVa8A:P1 (envelope-from ) for ; Sat, 14 Oct 2023 14:54:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id QHz4HW+PKmXnDgAAauVa8A (envelope-from ) for ; Sat, 14 Oct 2023 14:54:07 +0200 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 3886363399 for ; Sat, 14 Oct 2023 14:54:07 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=advoj+lc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1697288047; a=rsa-sha256; cv=none; b=hV9iqxXc3UNtg0BjamFPufWNlaz6+EcRrrGLiqh/UyNA6EIJOuZnS0k3RYTncU7f+axxXk TXQRrdA2YcXYUvG9bV0bfyNYxQXcweDjHnsjyXosyarx2UBWk9YseZsb4nFhz7fuw/uyTx sVzLDFoscAReNJvOwDkUsA4+JRFJ9BNuUmuRoftqzRckqn8rmE9M6sIAZqMNziu7lKmm+M dCe/kwbvPm1CK5aZ1jg8UC4EToqmibGLLI3O/dBdo7B+QE83rlIReUDwRlMQNvmKXHcQI7 hnOmPXgxZt/fDWKG0QQuJBfDlE5CQJCtZOXAT9VP5kXwI6MAkmr1xYy4mzInMw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=advoj+lc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1697288047; 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: content-transfer-encoding:content-transfer-encoding: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=uFlUimKcIgxNDsDKiDAEIu4YzrnVi7LDJiO8hQNyvms=; b=F2MqkIL1QNOsaaErKkxCsS14YftE7SZv1KZeu1zn8qFIjlkbtOXIsGksaTd1H3bzGc/Jjf Gyw74nwmhU3tLCpEr1k3org3v6BJuP9rCtX7e+A+QxqlkJegw5rkkkpJ5lXcdOpV7MzvAW sBYvZmeqtkTZXeuFkVE+C+u77PWHwCX/ByQ7sfY+bDLRxfkVkey2mXzeg4QuoIBxgD61F8 qOrzV7B3+7a4sDopfXUv3nn74qKmF6ml7pcsqNNVcx5I+fUNKopuGKtirkEcTP28HvKXYB 1CKi54AN82pnmWqBTsoCHhx/hbAMzjrBj4TJBVWbzyH6yk0KNv/C005STrtb7A== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qre9E-0001ig-Aw; Sat, 14 Oct 2023 08:53:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qre9C-0001iA-Ep for guix-patches@gnu.org; Sat, 14 Oct 2023 08:53:38 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qre9C-0003bR-6l for guix-patches@gnu.org; Sat, 14 Oct 2023 08:53:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qre9Z-0004k6-Oc for guix-patches@gnu.org; Sat, 14 Oct 2023 08:54:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH 1/7] gnu: mutter: Remove dependency on (guix build syscalls). Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Oct 2023 12:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66525 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 66525@debbugs.gnu.org, Liliana Marie Prikler , Raghav Gururajan Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.169728800018154 (code B ref 66525); Sat, 14 Oct 2023 12:54:01 +0000 Received: (at 66525) by debbugs.gnu.org; 14 Oct 2023 12:53:20 +0000 Received: from localhost ([127.0.0.1]:48118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qre8t-0004ik-Iw for submit@debbugs.gnu.org; Sat, 14 Oct 2023 08:53:19 -0400 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:59662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qre8q-0004iR-O9 for 66525@debbugs.gnu.org; Sat, 14 Oct 2023 08:53:17 -0400 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-66cfef11a25so17261896d6.3 for <66525@debbugs.gnu.org>; Sat, 14 Oct 2023 05:52:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697287967; x=1697892767; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uFlUimKcIgxNDsDKiDAEIu4YzrnVi7LDJiO8hQNyvms=; b=advoj+lcRfwFNjcXwcrfj0DwFckDYGJ2Y5VoUcEOIh83AfCj1ddXe2ieMi/6KKXHeL iN+75rauwKKQMbqMOWxwgeFAW8xGyq5jqmVJxERa5XWvD4baYNdtF+k1cMXOqU+j2iOF JB0Ogjhl4LrpPCu7pFRYj+daKz7e0JymvKcM5fbfFTFDjI9Az/MoCxULVd3FhM2JQhFC 2c5oFxyINYE44wHiS026MWPQyaOy5ya4GUE9yzFePHm1d817gSSjKmFlFrK145AkS77E NZ39zOC0qNv19i5rhrRznRJwS39bsyYBfU386TLAf2htkZr5xiAbkWFXoc3K/tHOszfA ihnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697287967; x=1697892767; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uFlUimKcIgxNDsDKiDAEIu4YzrnVi7LDJiO8hQNyvms=; b=WW21GxMVULknT/D8Ce9CwGHD3hXyXlUIAqZHMrKhsP1AoezHDAof3sU0VXCK6RcX6J yzCvzltGrqDIoIilmDL/7NC0tuyVcjM5DNdp0mxw5Vy1r7gHKkViyAeHJuzFlgqrz3Wg /oxrTjjv72cO8qbvD5iBHmTn9+ekdKY09jVtecedtG6OQo7yC3Z2OGnZgfrZ8YF7Jliw e6b5c/8DKhhZ92kIwCxuhSxzoIsz9ybSic57X/Lch91evlLQ6yfvbRCJwh+LzoqY4AZ2 sZJue9Dy9zO4WbO60cv9TD1z/dSf6YRZUobxmcxRx90GK+uxg75KTvqviEoypV6f8ENM 0BMQ== X-Gm-Message-State: AOJu0YzIjKLo6mie6B0db5wa7GjCsw6l8EtN9ok18kgRvRe9FgsOwpPr +bBowb2Py1qyWnY3zzx0r+SlS7r4kig= X-Google-Smtp-Source: AGHT+IEcQbnmkZROR4jdELRoDEdXdpQAQyIJsum2CiKih+ut/UctDwzNZCM3cyziA2kFTuIb8ABodg== X-Received: by 2002:a0c:8c45:0:b0:657:ace:63eb with SMTP id o5-20020a0c8c45000000b006570ace63ebmr25727277qvb.54.1697287967715; Sat, 14 Oct 2023 05:52:47 -0700 (PDT) Received: from hurd (dsl-156-181.b2b2c.ca. [66.158.156.181]) by smtp.gmail.com with ESMTPSA id ez13-20020ad4590d000000b0066d11e63ba1sm1645460qvb.5.2023.10.14.05.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Oct 2023 05:52:47 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <51c7e4c608c40f38c83a4ac9db88e8e1c2985ac1.1697211312.git.ludo@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Fri, 13 Oct 2023 17:47:44 +0200") References: <51c7e4c608c40f38c83a4ac9db88e8e1c2985ac1.1697211312.git.ludo@gnu.org> Date: Sat, 14 Oct 2023 08:52:45 -0400 Message-ID: <874jit5psy.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 4.31 X-Spam-Score: 4.31 X-Migadu-Queue-Id: 3886363399 X-TUID: 0pDT0PQGeVJ3 Hi Ludo, Ludovic Court=C3=A8s writes: > * gnu/packages/gnome.scm (mutter)[arguments]: Remove #:imported-modules. > Remove (guix build syscalls) from #:modules. > Rewrite =E2=80=98check=E2=80=99 phase to reap processes from the build pr= ocess. > [native-inputs]: Remove TINI. > --- > gnu/packages/gnome.scm | 25 +++++++++++-------------- > 1 file changed, 11 insertions(+), 14 deletions(-) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 908b5782b5..a4993b7aa9 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -7831,10 +7831,7 @@ (define-public mutter > (build-system meson-build-system) > (arguments > (list > - #:imported-modules `(,@%meson-build-system-modules > - (guix build syscalls)) > #:modules '((guix build meson-build-system) > - (guix build syscalls) > (guix build utils) > (ice-9 match)) > #:glib-or-gtk? #t > @@ -7928,22 +7925,23 @@ (define-public mutter > "1")) > (match (primitive-fork) > (0 ;child process > - (set-child-subreaper!) > ;; Use tini so that signals are properly handled and > ;; doubly-forked processes get reaped; otherwise, > ;; python-dbusmock would waste time polling for the d= bus > ;; processes it spawns to be reaped, in vain. As Bruno mentioned, the comment above has gone stale. > - (apply execlp "tini" "--" > - "dbus-run-session" "--" > + (apply execlp "dbus-run-session" "dbus-run-session" > "xvfb-run" "-a" "-s" (getenv "XVFB_SERVER_ARGS= ") > "meson" "test" "-t" "0" "--print-errorlogs" > test-options)) > - (pid > - (match (waitpid pid) > - ((_ . status) > - (unless (zero? status) > - (error "`meson test' exited with status" > - status)))))))))))) > + (dbus-pid > + (let loop () > + (match (waitpid WAIT_ANY) > + ((pid . status) > + (if (=3D pid dbus-pid) > + (unless (zero? status) > + (error "`meson test' exited with status" > + status)) > + (loop))))))))))))) Interesting simplification! I obviously wasn't aware this could work instead of the more intricate set-child-subreaper! + fake init (tini). I guess it solves a very narrow subset signal handling behavior compared to a real init, but that it is sufficient here. LGTM with comments from Bruno taken into account. I think it could go to core-updates since we're already prepping the branch. It may give some respite to the berlin aarch64 workers, which have been working non-stop for days or weeks. --=20 Thanks, Maxim