From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 8A0B86003; Sun, 11 Apr 2021 11:59:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id EA4435C6F; Sun, 11 Apr 2021 11:58:23 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id EA66F5B7B; Sun, 11 Apr 2021 11:58:20 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id B203E5B8F for ; Sun, 11 Apr 2021 11:57:57 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 23BFA5C00E2 for ; Sun, 11 Apr 2021 07:57:57 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 11 Apr 2021 07:57:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=niN1GB6cgLtLu Ht4yHDLO6yl/B8xXqalEuWAldUOQvo=; b=NCVH0hsn8+NsRXmSTsrT9PWhEfBtU 4Ol1wPQh+9GW4mPzdazdQInvSCocjHtuHZRHLs6at0G+iuQMeboIzB+YE744Rfjc T248iJ1djKi64NhqiVru2sm9yKYaz4T0YRsNe6SCMgnQUC0MIRSvUu2DgDB4nJnz 60Rf2qdUzE5f17nYYgHue6zmFjCzCD68pd54ToH4NfPBW3uRdzMaQlJ6/+cQ0AWp olEZCdMNOzzr8GKoJ1d8VOPSTuVYti7rcVk6VuAN8nFBHir2Py3llNH/iQCsru9c oxLmZMehpy3xokQ9PJ3IuiExSkfhGrJ6xPAVs+fFgWbDH+TcAecRJptow== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=niN1GB6cgLtLuHt4yHDLO6yl/B8xXqalEuWAldUOQvo=; b=Yuh993mC LZqtoRkVVJq6pxpaKuxFtbF5GtuqguHVICTCFA4PrXyEW59z6v1vdxv75x0lPck2 6mPiwW4GzYfkttKEWUpMGKV4LT/F8Q7VXWQENvLdepYU2FtvEfTl0qNeA1NcIV5Z vAB/5moUORSxGEV1gW37B3KEycruEAuu4/QokzZTrnjrLpNzaZ1emLtL00AVJroC fa0J4dttIec5jEg8Xlixy8B7ii+4FUyOU+kmcsDlnAQYX+ZVSdYTQTKGJn9AiDFr BMZcmXRuNNL9XpWBShc3r8Y7uYVAk/YbJATCn8HzojUvNl7ijFjiRMN5JKVaathr oSV25biPkcuhbg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekgedgudejhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdr ihhsqeenucggtffrrghtthgvrhhnpefgfedukedvleeileeludefveehgeelgfegvdduje dvtdffueeuveffheeljeekvdenucfkphepjeelrddvfeehrdduudelrddutdejnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepqhihlhhishhsse igvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Received: from x220.qyliss.net (p4feb776b.dip0.t-ipconnect.de [79.235.119.107]) by mail.messagingengine.com (Postfix) with ESMTPA id F23A724005C for ; Sun, 11 Apr 2021 07:57:56 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id B35AE1A41; Sun, 11 Apr 2021 11:57:55 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs 07/16] spectrumPackages: export makeRootfs Date: Sun, 11 Apr 2021 11:57:31 +0000 Message-Id: <20210411115740.29615-8-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210411115740.29615-1-hi@alyssa.is> References: <20210411115740.29615-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: CVTPHZQBE3CDJMSTXBAP445JWQFRVROY X-Message-ID-Hash: CVTPHZQBE3CDJMSTXBAP445JWQFRVROY X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: We'll want service VMs to be able to call this themselves to construct their own root filesystems. --- pkgs/os-specific/linux/spectrum/default.nix | 2 ++ pkgs/os-specific/linux/spectrum/rootfs/default.nix | 13 +++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/spectrum/default.nix b/pkgs/os-specific/linux/spectrum/default.nix index ea4fa902e95..ea86dc25c2b 100644 --- a/pkgs/os-specific/linux/spectrum/default.nix +++ b/pkgs/os-specific/linux/spectrum/default.nix @@ -8,6 +8,8 @@ let linux_vm = callPackage ./linux/vm.nix { linux = linux_cros; }; + makeRootfs = callPackage ./rootfs/generic.nix { }; + rootfs = callPackage ./rootfs { }; }; in diff --git a/pkgs/os-specific/linux/spectrum/rootfs/default.nix b/pkgs/os-specific/linux/spectrum/rootfs/default.nix index cd1cccc1a87..6f46ad8054b 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/default.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/default.nix @@ -1,16 +1,9 @@ -{ runCommandNoCC, writeScript, writeText, makeFontsConf, writeReferencesToFile -, lib, dash, busybox, execline, s6, s6-portable-utils, s6-linux-utils -, s6-linux-init, mesa, squashfs-tools-ng -, source-code-pro, zsh, emacs26-nox, gcc, wayfire, sommelier, westonLite +{ writeScript, writeText, lib, makeRootfs +, busybox, execline, s6, sommelier, source-code-pro, wayfire, zsh +, gcc, emacs26-nox, westonLite }: let - makeRootfs = import ./generic.nix { - inherit runCommandNoCC writeScript writeReferencesToFile makeFontsConf lib - dash execline s6 s6-portable-utils s6-linux-utils s6-linux-init busybox - mesa squashfs-tools-ng; - }; - path = [ zsh emacs26-nox gcc wayfire sommelier westonLite busybox s6 execline ]; -- 2.30.0