From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id DD72C90723; Mon, 10 Oct 2022 23:33:18 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 9EADA90377; Mon, 10 Oct 2022 23:32:44 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 0CE8790101 for ; Mon, 10 Oct 2022 23:32:14 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 877215C01C5 for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 10 Oct 2022 19:32:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1665444730; x=1665531130; bh=HK rW5AzTCBrTcjOAn6ZB3pxDpXdzXSL0QWaqCtXgEx8=; b=CBPg8xLbwPTmppgIIV nzm8rh4lb2tOQvqEzut1K5AksHNhGj0eCMhgcDGL6TDtB12MeD0fWdSo9vwHhP3V 2i1kNqJpxZzengHU6/1T+d1waz2/HAlaQwVBbKAhot9p58bpAJ6NKdqHbNo7YCln qVldG1DJvf0suM6EeEhXgqZsrBS5S/GAp1bqWFLRXXRd/NFFpu2BzZB2GVqoZL+x Ko/eSBpmEWLKbLQPPtPYZ4VRn2UuHkv4C/+oB7injCJzfK7ckcF1+oQ5q8Yvq1Tp 9hylzEtxtXgOaGUAUmeJkpTZY/L75ypycuTlUdiZWIrYtgejczhIotbZN4AG0QjT qdRg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1665444730; x=1665531130; bh=HKrW5AzTCBrTc jOAn6ZB3pxDpXdzXSL0QWaqCtXgEx8=; b=iRPDh4Ai/jI84mf2YpYr9GXoM8SkA B1wOVEBtTmFOP6iHrzbmuFGjmSwP1N8p+v1l/+fsxDEh5in9dKPc+42vdCoqaMH/ Pjl3ntPg9vFVvYLrDcHTdz9QA38spQ1r+MaF1BIcFX/4RVP4KIjzXbBu8pJgZEhE 7YhWHHr61PdcLN1a+gkM/50UD37vJyPVFC7pLfoLguMw76QoRlMRa8GUhqvl+x7N yzEY6M6UuDlGukq+8rimDiPyGYxtUoMlcmuNitoAM86JPNEIoQGT8EPvKEetIKbS tmn1SDfkXisDd2dqTix5lQqvHdU4NLHhZlwXHUq6VE+Y+hn+OE8+qG7Tg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejhedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepudegveegudfgkeehuefhjeeutdegvedtvddvveffud egveeuhfeliefggfegffdtnecuffhomhgrihhnpegtfhhgrdhinhdpshhpvggtthhruhhm qdhoshdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehqhihlihhsshesgidvvddtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id D941ABCC; Mon, 10 Oct 2022 23:32:07 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH v2 5/6] release: rename from "img" Date: Mon, 10 Oct 2022 23:29:08 +0000 Message-Id: <20221010232909.1953738-29-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221010232909.1953738-1-hi@alyssa.is> References: <20221010232909.1953738-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: HL2LYSRBUIXCYWWKSN3KVP3EC5E3B3TY X-Message-ID-Hash: HL2LYSRBUIXCYWWKSN3KVP3EC5E3B3TY 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; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: I think this is more descriptive, and "img" is a name better used for VM images. Signed-off-by: Alyssa Ross --- Documentation/getting-spectrum.adoc | 2 +- release.nix | 2 +- {img => release}/combined/default.nix | 0 {img => release}/combined/eosimages.nix | 0 {img => release}/combined/grub.cfg.in | 0 {img => release}/combined/run-vm.nix | 0 .../app/0001-gpt-disable-gpt-partition-attribute-55-check.patch | 0 .../app/0002-gpt-disable-partition-table-CRC-check.patch | 0 .../installer/app/0003-install-remove-Endless-OS-ad.patch | 0 .../installer/app/0004-finished-don-t-run-eos-diagnostics.patch | 0 .../0005-finished-promote-spectrum-not-the-Endless-forum.patch | 0 {img => release}/installer/app/default.nix | 0 {img => release}/installer/app/vendor-customer-support.ini | 0 {img => release}/installer/configuration.nix | 0 {img => release}/installer/default.nix | 0 {img => release}/installer/run-vm.nix | 0 {img => release}/installer/seat.rules | 0 {img => release}/live/Makefile | 0 {img => release}/live/default.nix | 0 {img => release}/live/shell.nix | 0 20 files changed, 2 insertions(+), 2 deletions(-) rename {img => release}/combined/default.nix (100%) rename {img => release}/combined/eosimages.nix (100%) rename {img => release}/combined/grub.cfg.in (100%) rename {img => release}/combined/run-vm.nix (100%) rename {img => release}/installer/app/0001-gpt-disable-gpt-partition-attribute-55-check.patch (100%) rename {img => release}/installer/app/0002-gpt-disable-partition-table-CRC-check.patch (100%) rename {img => release}/installer/app/0003-install-remove-Endless-OS-ad.patch (100%) rename {img => release}/installer/app/0004-finished-don-t-run-eos-diagnostics.patch (100%) rename {img => release}/installer/app/0005-finished-promote-spectrum-not-the-Endless-forum.patch (100%) rename {img => release}/installer/app/default.nix (100%) rename {img => release}/installer/app/vendor-customer-support.ini (100%) rename {img => release}/installer/configuration.nix (100%) rename {img => release}/installer/default.nix (100%) rename {img => release}/installer/run-vm.nix (100%) rename {img => release}/installer/seat.rules (100%) rename {img => release}/live/Makefile (100%) rename {img => release}/live/default.nix (100%) rename {img => release}/live/shell.nix (100%) diff --git a/Documentation/getting-spectrum.adoc b/Documentation/getting-spectrum.adoc index b3fa1ef..a34ac5e 100644 --- a/Documentation/getting-spectrum.adoc +++ b/Documentation/getting-spectrum.adoc @@ -39,7 +39,7 @@ still take a very long time. [source,shell] ---- git clone https://spectrum-os.org/git/spectrum -nix-build spectrum/img/combined \ +nix-build spectrum/release/combined \ -I nixpkgs=https://spectrum-os.org/git/nixpkgs/snapshot/nixpkgs-rootfs.tar.gz ---- diff --git a/release.nix b/release.nix index 91a843b..eea10a0 100644 --- a/release.nix +++ b/release.nix @@ -12,5 +12,5 @@ { doc = import ./Documentation { inherit config; }; - combined = import img/combined/run-vm.nix { inherit config; }; + combined = import release/combined/run-vm.nix { inherit config; }; } diff --git a/img/combined/default.nix b/release/combined/default.nix similarity index 100% rename from img/combined/default.nix rename to release/combined/default.nix diff --git a/img/combined/eosimages.nix b/release/combined/eosimages.nix similarity index 100% rename from img/combined/eosimages.nix rename to release/combined/eosimages.nix diff --git a/img/combined/grub.cfg.in b/release/combined/grub.cfg.in similarity index 100% rename from img/combined/grub.cfg.in rename to release/combined/grub.cfg.in diff --git a/img/combined/run-vm.nix b/release/combined/run-vm.nix similarity index 100% rename from img/combined/run-vm.nix rename to release/combined/run-vm.nix diff --git a/img/installer/app/0001-gpt-disable-gpt-partition-attribute-55-check.patch b/release/installer/app/0001-gpt-disable-gpt-partition-attribute-55-check.patch similarity index 100% rename from img/installer/app/0001-gpt-disable-gpt-partition-attribute-55-check.patch rename to release/installer/app/0001-gpt-disable-gpt-partition-attribute-55-check.patch diff --git a/img/installer/app/0002-gpt-disable-partition-table-CRC-check.patch b/release/installer/app/0002-gpt-disable-partition-table-CRC-check.patch similarity index 100% rename from img/installer/app/0002-gpt-disable-partition-table-CRC-check.patch rename to release/installer/app/0002-gpt-disable-partition-table-CRC-check.patch diff --git a/img/installer/app/0003-install-remove-Endless-OS-ad.patch b/release/installer/app/0003-install-remove-Endless-OS-ad.patch similarity index 100% rename from img/installer/app/0003-install-remove-Endless-OS-ad.patch rename to release/installer/app/0003-install-remove-Endless-OS-ad.patch diff --git a/img/installer/app/0004-finished-don-t-run-eos-diagnostics.patch b/release/installer/app/0004-finished-don-t-run-eos-diagnostics.patch similarity index 100% rename from img/installer/app/0004-finished-don-t-run-eos-diagnostics.patch rename to release/installer/app/0004-finished-don-t-run-eos-diagnostics.patch diff --git a/img/installer/app/0005-finished-promote-spectrum-not-the-Endless-forum.patch b/release/installer/app/0005-finished-promote-spectrum-not-the-Endless-forum.patch similarity index 100% rename from img/installer/app/0005-finished-promote-spectrum-not-the-Endless-forum.patch rename to release/installer/app/0005-finished-promote-spectrum-not-the-Endless-forum.patch diff --git a/img/installer/app/default.nix b/release/installer/app/default.nix similarity index 100% rename from img/installer/app/default.nix rename to release/installer/app/default.nix diff --git a/img/installer/app/vendor-customer-support.ini b/release/installer/app/vendor-customer-support.ini similarity index 100% rename from img/installer/app/vendor-customer-support.ini rename to release/installer/app/vendor-customer-support.ini diff --git a/img/installer/configuration.nix b/release/installer/configuration.nix similarity index 100% rename from img/installer/configuration.nix rename to release/installer/configuration.nix diff --git a/img/installer/default.nix b/release/installer/default.nix similarity index 100% rename from img/installer/default.nix rename to release/installer/default.nix diff --git a/img/installer/run-vm.nix b/release/installer/run-vm.nix similarity index 100% rename from img/installer/run-vm.nix rename to release/installer/run-vm.nix diff --git a/img/installer/seat.rules b/release/installer/seat.rules similarity index 100% rename from img/installer/seat.rules rename to release/installer/seat.rules diff --git a/img/live/Makefile b/release/live/Makefile similarity index 100% rename from img/live/Makefile rename to release/live/Makefile diff --git a/img/live/default.nix b/release/live/default.nix similarity index 100% rename from img/live/default.nix rename to release/live/default.nix diff --git a/img/live/shell.nix b/release/live/shell.nix similarity index 100% rename from img/live/shell.nix rename to release/live/shell.nix -- 2.37.1