From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH v2 5/6] release: rename from "img"
Date: Sun, 9 Oct 2022 11:40:35 +0000 [thread overview]
Message-ID: <20221009114036.463071-6-hi@alyssa.is> (raw)
In-Reply-To: <20221009114036.463071-1-hi@alyssa.is>
I think this is more descriptive, and "img" is a name better used for
VM images.
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
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
next prev parent reply other threads:[~2022-10-09 11:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-09 11:40 [PATCH v2 0/6] Introduce a shared base for application VMs Alyssa Ross
2022-10-09 11:40 ` [PATCH v2 1/6] host/start-vm: support multiple block devices Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-09 11:40 ` [PATCH v2 2/6] scripts/make-gpt.sh: add support for labels Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-09 11:40 ` [PATCH v2 3/6] vm: build GPT images Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-09 11:40 ` [PATCH v2 4/6] host/start-vm: boot using partition label Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-09 11:40 ` Alyssa Ross [this message]
2022-11-14 1:14 ` [PATCH v2 5/6] release: rename from "img" Alyssa Ross
2022-10-09 11:40 ` [PATCH v2 6/6] img/app: extract from appvm-{lynx,catgirl} Alyssa Ross
2022-11-14 1:14 ` Alyssa Ross
2022-10-10 23:28 [PATCH 00/22] Implement managing VMs with Nix Alyssa Ross
2022-10-10 23:29 ` [PATCH v2 5/6] release: rename from "img" Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221009114036.463071-6-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).