From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 061431DEBC; Mon, 24 Nov 2025 19:49:32 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 44FB11DF05; Mon, 24 Nov 2025 19:49:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fhigh-a8-smtp.messagingengine.com (fhigh-a8-smtp.messagingengine.com [103.168.172.159]) by atuin.qyliss.net (Postfix) with ESMTPS id 8BCB91DF04 for ; Mon, 24 Nov 2025 19:49:28 +0000 (UTC) Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfhigh.phl.internal (Postfix) with ESMTP id CA4321400058; Mon, 24 Nov 2025 14:49:26 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Mon, 24 Nov 2025 14:49:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1764013766; x= 1764100166; bh=z6e388nkeL5LKEQOScUit42ZxnNQWRHgTn+A+DeMBYI=; b=b n87zZ5axrWCTDJ+lk4/Wq/ssEomrWrIF4KYfbMJlC16eTd8DqTzG6R0swFRFxGk+ 7XwYQJslcplYPIAgaus5tCuVulSVD5IAxM2DR2a3Cy0Uqea/gKx/nUl960PoKyv1 kiWqox48c6l3ef9sz1KOkVeCvgTYl5fmxebQZxqkaa72NNBQUZbZVoGQXl2w/o0e H9kSw/gZQYkCEI+0ujE2q9hqzE+FK3U5Yj9ganP37j8WxqrKhSINN2gBy5NF/T3i JI1DYm0RcsasvSIsCLszX3kka359shhLa4//TeWjLfTcmhDvWlfJLthAOYEOz40F NsKbrijqCADzn9leHSkAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1764013766; x=1764100166; bh=z 6e388nkeL5LKEQOScUit42ZxnNQWRHgTn+A+DeMBYI=; b=eW6naRUQPWKWqPheA QN/lCoFrps7uzTT9S0MThvy1AhNvd/nJz4xUTOeMKvJKTp7SIgUyJrEDZqpvISLL n3GDJhFQd5MJQ6fgmMl2QUG/Zk8wqVamgOWUniAJxQ336048GS3+YQPVfV9B8zQA UuxtinhA0XAQAZthyaYs5q0+aGozSfEMft10bOS1hWzOb7jxWDhKfpLxzhgbXfOZ yNRrAo+GHPDq5iy+8iAuaR9EOCbSM3m+MpMcNj3Neq0wyrdZtyHB4vHJhY6TGOaF WrqsmznaUW74RyUznNmO3wot8Np4L078/7evKU2kNXj4ffGWpZTzSbLSCNl0ulWL IS9CQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvfeelgeekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehlhihsshgr ucftohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnheptefhge eiffffleetudeuledtleeutefhueetveeiteeugfegfeduvdelgfdtfedvnecuffhomhgr ihhnpehsphgvtghtrhhumhdqohhsrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhephhhisegrlhihshhsrgdrihhspdhnsggprhgtphht thhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeguvghmihhosggvnhhouh hrsehgmhgrihhlrdgtohhmpdhrtghpthhtohepuggvvhgvlhesshhpvggtthhruhhmqdho shdrohhrgh X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 24 Nov 2025 14:49:25 -0500 (EST) Received: by fw12.qyliss.net (Postfix, from userid 1000) id 1C8CE25685F9; Mon, 24 Nov 2025 20:49:23 +0100 (CET) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH v2 2/3] img/app: run Flatpak applications Date: Mon, 24 Nov 2025 20:46:26 +0100 Message-ID: <20251124194846.16338-3-hi@alyssa.is> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251124194846.16338-1-hi@alyssa.is> References: <20251124194846.16338-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: ZAHPM5MXXCKFR5BX4K4ARASB6MD4YNE3 X-Message-ID-Hash: ZAHPM5MXXCKFR5BX4K4ARASB6MD4YNE3 X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Demi Marie Obenour X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Alyssa Ross --- v2: unchanged v1: https://spectrum-os.org/lists/archives/spectrum-devel/20251113120452.65711-2-hi@alyssa.is/ img/app/default.nix | 1 + img/app/file-list.mk | 1 + .../image/etc/flatpak/installations.d/extra.conf | 5 +++++ img/app/image/etc/s6-rc/app/run | 14 +++++++++++++- 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 img/app/image/etc/flatpak/installations.d/extra.conf diff --git a/img/app/default.nix b/img/app/default.nix index 6490ac2..c1a1706 100644 --- a/img/app/default.nix +++ b/img/app/default.nix @@ -49,6 +49,7 @@ let name = "vm-fhs-env"; targetPkgs = pkgs: appimageTools.defaultFhsEnvArgs.targetPkgs pkgs ++ [ pkgs.fuse + pkgs.flatpak (pkgs.busybox.override { enableMinimal = true; diff --git a/img/app/file-list.mk b/img/app/file-list.mk index 6934975..4fbdec2 100644 --- a/img/app/file-list.mk +++ b/img/app/file-list.mk @@ -3,6 +3,7 @@ FILES = \ image/etc/dbus-1/session.conf \ + image/etc/flatpak/installations.d/extra.conf \ image/etc/fstab \ image/etc/mdev.conf \ image/etc/mdev/iface \ diff --git a/img/app/image/etc/flatpak/installations.d/extra.conf b/img/app/image/etc/flatpak/installations.d/extra.conf new file mode 100644 index 0000000..448902b --- /dev/null +++ b/img/app/image/etc/flatpak/installations.d/extra.conf @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: 2025 Alyssa Ross + +[Installation "virtiofs"] +Path=/run/virtiofs/virtiofs0/config/flatpak diff --git a/img/app/image/etc/s6-rc/app/run b/img/app/image/etc/s6-rc/app/run index 601926b..4b3b8d6 100755 --- a/img/app/image/etc/s6-rc/app/run +++ b/img/app/image/etc/s6-rc/app/run @@ -1,6 +1,6 @@ #!/bin/execlineb -P # SPDX-License-Identifier: EUPL-1.2+ -# SPDX-FileCopyrightText: 2021, 2024 Alyssa Ross +# SPDX-FileCopyrightText: 2021, 2024-2025 Alyssa Ross export TMPDIR /run @@ -25,6 +25,18 @@ foreground { export LD_LIBRARY_PATH /lib64 /run/virtiofs/virtiofs0/config/run } + flatpak { + s6-envdir -fnL /run/virtiofs/virtiofs0/config/params + multisubstitute { + importas -iu id id + importas -iu arch arch + importas -iu branch branch + importas -iu commit commit + importas -iu runtime_commit runtime-commit + } + flatpak run --installation=virtiofs --arch=${arch} --branch=${branch} + --commit=${commit} --runtime-commit=${runtime_commit} $id + } nix { if { mount -t overlay -- 2.51.0