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 4E32B13C68; Wed, 17 Sep 2025 12:30:42 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id B14ED13C5C; Wed, 17 Sep 2025 12:30:40 +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-a6-smtp.messagingengine.com (fhigh-a6-smtp.messagingengine.com [103.168.172.157]) by atuin.qyliss.net (Postfix) with ESMTPS id 235CA13C55 for ; Wed, 17 Sep 2025 12:30:39 +0000 (UTC) Received: from phl-compute-03.internal (phl-compute-03.internal [10.202.2.43]) by mailfhigh.phl.internal (Postfix) with ESMTP id 1A7C6140021F; Wed, 17 Sep 2025 08:30:38 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Wed, 17 Sep 2025 08:30:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1758112238; x=1758198638; bh=K1o2aWpT9L zPx6VLJIZh3HEEnMW+br8VVAQHUJmZFZ0=; b=ORa+aSnl5V4aTlSKLRBC110ddQ uLzGWKJSL0nxtyJx1QvzY0LCzycVHB4f4MGqBqoyumvfMYKQs6anD6qibdTquAkh 3YUoaQlUTwfL1xg9ft7OhZuXtrPcjJ8STGpvvWq7yOjyHjWiynQne6WbXYWXgw9e RAbV9BUeAT9XvY0Dcw/TTavbXlW5Zqd6KYWNwtociOaxlcpMaUNBoQxkAMBS19vG Oy0FDZrrN1TAs6sJwDIIUdkWqoQGf3ChfBmMh6ujiV8rTL+Nut6yS+cmOG4PByrU YLEQbTSNOQGP9M+BnEizlwdWRZ3XmUemfTPLrRq93CRAwQvIfFz93ZEESA9w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type: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=fm1; t= 1758112238; x=1758198638; bh=K1o2aWpT9LzPx6VLJIZh3HEEnMW+br8VVAQ HUJmZFZ0=; b=VOdT1ERt9m/qr9bi6twb6IccAX33CNO0ifgLXCvrYiE0wTb9kn/ mTxDbHsVGTsfZLuFwc0d0TidgDePp2E1reHaTFuyxSDi4Wqk1J9iyXQp14t9jUCA RoL+6IwzwrjG5bWYfYR+Rp4Tumfq6OKSrg4SWUTnTTu+QOCo+b1W7o/gpDZz7Dv9 e1zFG+wuTq8iXMIXVVtugcG63N49ogMrTQtOVVFD3q5yyT2LXCl8OweJjQUGH97l xnDdSeZUorQNgTxZVTPSFLw62Eu+5+BDZgNh8vt/gPlILzINJ5RvMyj4cBOABfco /Ne+aj3y9901QdQZv3lJN0fyPzsthURWTEA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggdegfeeghecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvffujghffffkgggtsehgtderredttdejnecuhfhrohhmpeetlhihshhsrgcutfho shhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeefledvudetff ehjeetieelleehteffgfejleefgeeftdeiudfftdeuvddtjeetteenucffohhmrghinhep shhhuhhtughofihnrdhfihhnrghlnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhephhhisegrlhihshhsrgdrihhspdhnsggprhgtphhtthhopedv pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeguvghmihhosggvnhhouhhrsehgmh grihhlrdgtohhmpdhrtghpthhtohepuggvvhgvlhesshhpvggtthhruhhmqdhoshdrohhr gh X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 17 Sep 2025 08:30:37 -0400 (EDT) Received: by mbp.qyliss.net (Postfix, from userid 1000) id 29A1F1F8191A; Wed, 17 Sep 2025 14:30:26 +0200 (CEST) From: Alyssa Ross To: Demi Marie Obenour , Spectrum OS Development Subject: Re: [PATCH v3 2/4] Move all files for the image into a subdirectory In-Reply-To: <20250911-genfiles-v3-2-d8709081dc5c@gmail.com> References: <20250911-genfiles-v3-0-d8709081dc5c@gmail.com> <20250911-genfiles-v3-2-d8709081dc5c@gmail.com> Date: Wed, 17 Sep 2025 14:30:25 +0200 Message-ID: <87jz1xxnvi.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Message-ID-Hash: TY67VSIZK3GOXVGHK53NM7JBWPQU333T X-Message-ID-Hash: TY67VSIZK3GOXVGHK53NM7JBWPQU333T 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 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: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Demi Marie Obenour writes: > diff --git a/img/app/Makefile b/img/app/Makefile > index 73db07cc4c781d9c41cdf41a6214298aae8de58a..0099aa3b9626bfcc2079e5c67= 401db4e5316caeb 100644 > --- a/img/app/Makefile > +++ b/img/app/Makefile > @@ -30,32 +30,32 @@ $(imgdir)/appvm/blk/root.img: ../../scripts/make-gpt.= sh ../../scripts/sfdisk-fie > mv $@.tmp $@ >=20=20 > VM_FILES =3D \ > - etc/dbus-1/session.conf \ > - etc/fonts/fonts.conf \ > - etc/fstab \ > - etc/init \ > - etc/mdev.conf \ > - etc/mdev/iface \ > - etc/mdev/listen \ > - etc/mdev/virtiofs \ > - etc/mdev/wait \ > - etc/passwd \ > - etc/pipewire/pipewire.conf \ > - etc/resolv.conf \ > - etc/s6-linux-init/env/DBUS_SESSION_BUS_ADDRESS \ > - etc/s6-linux-init/env/DISPLAY \ > - etc/s6-linux-init/env/GTK_USE_PORTAL \ > - etc/s6-linux-init/env/NIX_XDG_DESKTOP_PORTAL_DIR \ > - etc/s6-linux-init/env/WAYLAND_DISPLAY \ > - etc/s6-linux-init/env/XDG_RUNTIME_DIR \ > - etc/s6-linux-init/run-image/service/getty-hvc0/run \ > - etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notificatio= n-fd \ > - etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/run \ > - etc/s6-linux-init/scripts/rc.init \ > - etc/s6-linux-init/scripts/rc.shutdown \ > - etc/s6-linux-init/scripts/rc.shutdown.final \ > - etc/wireplumber/wireplumber.conf.d/99_spectrum.conf \ > - etc/xdg/xdg-desktop-portal/portals.conf > + image/etc/dbus-1/session.conf \ > + image/etc/fonts/fonts.conf \ > + image/etc/fstab \ > + image/etc/init \ > + image/etc/mdev.conf \ > + image/etc/mdev/iface \ > + image/etc/mdev/listen \ > + image/etc/mdev/virtiofs \ > + image/etc/mdev/wait \ > + image/etc/passwd \ > + image/etc/pipewire/pipewire.conf \ > + image/etc/resolv.conf \ > + image/etc/s6-linux-init/env/DBUS_SESSION_BUS_ADDRESS \ > + image/etc/s6-linux-init/env/DISPLAY \ > + image/etc/s6-linux-init/env/GTK_USE_PORTAL \ > + image/etc/s6-linux-init/env/NIX_XDG_DESKTOP_PORTAL_DIR \ > + image/etc/s6-linux-init/env/WAYLAND_DISPLAY \ > + image/etc/s6-linux-init/env/XDG_RUNTIME_DIR \ > + image/etc/s6-linux-init/run-image/service/getty-hvc0/run \ > + image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/notif= ication-fd \ > + image/etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/run \ > + image/etc/s6-linux-init/scripts/rc.init \ > + image/etc/s6-linux-init/scripts/rc.shutdown \ > + image/etc/s6-linux-init/scripts/rc.shutdown.final \ > + image/etc/wireplumber/wireplumber.conf.d/99_spectrum.conf \ > + image/etc/xdg/xdg-desktop-portal/portals.conf >=20=20 > VM_DIRS =3D dev run proc sys tmp \ > etc/s6-linux-init/run-image/service \ It's a bit of a shame that this makes VM_FILES and VM_DIRS asymmetric, but I guess it's worth it=E2=80=A6 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRV/neXydHjZma5XLJbRZGEIw/wogUCaMqp4QAKCRBbRZGEIw/w otAYAP91dr/KpDB1I5WikQLSCquV1+zq9IZ+TGmoIBAwsqq4PwD+KNDFrXV+zLQY kgJLfk01p4H2rYjenyOcgiOrZ8R2gQQ= =FP+M -----END PGP SIGNATURE----- --=-=-=--