summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-10-09 11:40:35 +0000
committerAlyssa Ross <hi@alyssa.is>2022-11-13 23:58:53 +0000
commitd30f0248583e523eddb716aa931489b11a44e3f6 (patch)
tree39417941eb3d7c5366a0768c4692c83547a2af2a
parent7266451ab6136d75142e6e45e2bc8c6843bbc994 (diff)
downloadspectrum-d30f0248583e523eddb716aa931489b11a44e3f6.tar
spectrum-d30f0248583e523eddb716aa931489b11a44e3f6.tar.gz
spectrum-d30f0248583e523eddb716aa931489b11a44e3f6.tar.bz2
spectrum-d30f0248583e523eddb716aa931489b11a44e3f6.tar.lz
spectrum-d30f0248583e523eddb716aa931489b11a44e3f6.tar.xz
spectrum-d30f0248583e523eddb716aa931489b11a44e3f6.tar.zst
spectrum-d30f0248583e523eddb716aa931489b11a44e3f6.zip
release: rename from "img"
I think this is more descriptive, and "img" is a name better used for
VM images.

Signed-off-by: Alyssa Ross <hi@alyssa.is>
Message-Id: <20221009114036.463071-6-hi@alyssa.is>
-rw-r--r--Documentation/installation/getting-spectrum.adoc2
-rw-r--r--release.nix2
-rw-r--r--release/combined/default.nix (renamed from img/combined/default.nix)0
-rw-r--r--release/combined/eosimages.nix (renamed from img/combined/eosimages.nix)0
-rw-r--r--release/combined/grub.cfg.in (renamed from img/combined/grub.cfg.in)0
-rw-r--r--release/combined/run-vm.nix (renamed from img/combined/run-vm.nix)0
-rw-r--r--release/installer/app/0001-gpt-disable-gpt-partition-attribute-55-check.patch (renamed from img/installer/app/0001-gpt-disable-gpt-partition-attribute-55-check.patch)0
-rw-r--r--release/installer/app/0002-gpt-disable-partition-table-CRC-check.patch (renamed from img/installer/app/0002-gpt-disable-partition-table-CRC-check.patch)0
-rw-r--r--release/installer/app/0003-install-remove-Endless-OS-ad.patch (renamed from img/installer/app/0003-install-remove-Endless-OS-ad.patch)0
-rw-r--r--release/installer/app/0004-finished-don-t-run-eos-diagnostics.patch (renamed from img/installer/app/0004-finished-don-t-run-eos-diagnostics.patch)0
-rw-r--r--release/installer/app/0005-finished-promote-spectrum-not-the-Endless-forum.patch (renamed from img/installer/app/0005-finished-promote-spectrum-not-the-Endless-forum.patch)0
-rw-r--r--release/installer/app/default.nix (renamed from img/installer/app/default.nix)0
-rw-r--r--release/installer/app/vendor-customer-support.ini (renamed from img/installer/app/vendor-customer-support.ini)0
-rw-r--r--release/installer/configuration.nix (renamed from img/installer/configuration.nix)0
-rw-r--r--release/installer/default.nix (renamed from img/installer/default.nix)0
-rw-r--r--release/installer/run-vm.nix (renamed from img/installer/run-vm.nix)0
-rw-r--r--release/installer/seat.rules (renamed from img/installer/seat.rules)0
-rw-r--r--release/live/Makefile (renamed from img/live/Makefile)0
-rw-r--r--release/live/default.nix (renamed from img/live/default.nix)0
-rw-r--r--release/live/shell.nix (renamed from img/live/shell.nix)0
20 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/installation/getting-spectrum.adoc b/Documentation/installation/getting-spectrum.adoc
index 392cab5..6aec34f 100644
--- a/Documentation/installation/getting-spectrum.adoc
+++ b/Documentation/installation/getting-spectrum.adoc
@@ -40,7 +40,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 3ecf8a7..15471d0 100644
--- a/release.nix
+++ b/release.nix
@@ -14,5 +14,5 @@
 
   checks = import nix/checks.nix { 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
index 2865376..2865376 100644
--- a/img/combined/default.nix
+++ b/release/combined/default.nix
diff --git a/img/combined/eosimages.nix b/release/combined/eosimages.nix
index 9f2ab10..9f2ab10 100644
--- a/img/combined/eosimages.nix
+++ b/release/combined/eosimages.nix
diff --git a/img/combined/grub.cfg.in b/release/combined/grub.cfg.in
index d24391d..d24391d 100644
--- a/img/combined/grub.cfg.in
+++ b/release/combined/grub.cfg.in
diff --git a/img/combined/run-vm.nix b/release/combined/run-vm.nix
index 047bc3f..047bc3f 100644
--- a/img/combined/run-vm.nix
+++ b/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
index 2e37268..2e37268 100644
--- 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
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
index 2075067..2075067 100644
--- a/img/installer/app/0002-gpt-disable-partition-table-CRC-check.patch
+++ b/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
index 33abd60..33abd60 100644
--- a/img/installer/app/0003-install-remove-Endless-OS-ad.patch
+++ b/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
index a4827ba..a4827ba 100644
--- a/img/installer/app/0004-finished-don-t-run-eos-diagnostics.patch
+++ b/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
index 590635d..590635d 100644
--- 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
diff --git a/img/installer/app/default.nix b/release/installer/app/default.nix
index 26f0b81..26f0b81 100644
--- a/img/installer/app/default.nix
+++ b/release/installer/app/default.nix
diff --git a/img/installer/app/vendor-customer-support.ini b/release/installer/app/vendor-customer-support.ini
index 4c4e650..4c4e650 100644
--- a/img/installer/app/vendor-customer-support.ini
+++ b/release/installer/app/vendor-customer-support.ini
diff --git a/img/installer/configuration.nix b/release/installer/configuration.nix
index 50d154f..50d154f 100644
--- a/img/installer/configuration.nix
+++ b/release/installer/configuration.nix
diff --git a/img/installer/default.nix b/release/installer/default.nix
index 0c57704..0c57704 100644
--- a/img/installer/default.nix
+++ b/release/installer/default.nix
diff --git a/img/installer/run-vm.nix b/release/installer/run-vm.nix
index 4efbf1a..4efbf1a 100644
--- a/img/installer/run-vm.nix
+++ b/release/installer/run-vm.nix
diff --git a/img/installer/seat.rules b/release/installer/seat.rules
index 79ff400..79ff400 100644
--- a/img/installer/seat.rules
+++ b/release/installer/seat.rules
diff --git a/img/live/Makefile b/release/live/Makefile
index 773d597..773d597 100644
--- a/img/live/Makefile
+++ b/release/live/Makefile
diff --git a/img/live/default.nix b/release/live/default.nix
index 4301ccc..4301ccc 100644
--- a/img/live/default.nix
+++ b/release/live/default.nix
diff --git a/img/live/shell.nix b/release/live/shell.nix
index dcf2059..dcf2059 100644
--- a/img/live/shell.nix
+++ b/release/live/shell.nix