iso: Review image name

macaroni-os · Oct 20, 2024 · 91a32b0 · 91a32b0
1 parent 5551073
commit 91a32b0
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 56 deletions.
diff --git a/iso/mark-dev.yaml b/iso/mark-dev.yaml
@@ -162,18 +162,14 @@ repository:
   - repository/mottainai-stable
   - repository/macaroni-phoenix
   - repository/macaroni-commons
-  #- repository/macaroni-funtoo-testing
-  #- repository/macaroni-commons-testing
-  #- repository/macaroni-funtoo-dev
-  #- repository/macaroni-commons-dev
   - repository/macaroni-security
 
 initramfs:
   kernel_file: "bzImage"
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Gnome-Dev-0."
+image_prefix: "Macaroni-Phoenix-Gnome-Dev-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-gnome-devel.yaml b/iso/mark-gnome-devel.yaml
@@ -178,17 +178,13 @@ repository:
   - repository/macaroni-phoenix
   - repository/macaroni-commons
   - repository/macaroni-security
-  #- repository/macaroni-phoenix-testing
-  #- repository/macaroni-commons-testing
-  #- repository/macaroni-funtoo-dev
-  #- repository/macaroni-commons-dev
 
 initramfs:
   kernel_file: "bzImage"
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Gnome-Devel-0."
+image_prefix: "Macaroni-Phoenix-Gnome-Devel-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-i3-testing.yaml b/iso/mark-i3-testing.yaml
@@ -153,15 +153,15 @@ packages:
 repository:
   packages:
   - repository/mottainai-testing
-  - repository/macaroni-funtoo-testing
+  - repository/macaroni-phoenix-testing
   - repository/macaroni-commons-testing
 
 initramfs:
   kernel_file: "bzImage"
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-i3-Testing-0."
+image_prefix: "Macaroni-Phoenix-i3-Testing-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-i3.yaml b/iso/mark-i3.yaml
@@ -155,7 +155,7 @@ packages:
 repository:
   packages:
   - repository/mottainai-stable
-  - repository/macaroni-funtoo
+  - repository/macaroni-phoenix
   - repository/macaroni-commons
   - repository/macaroni-security
 
@@ -164,7 +164,7 @@ initramfs:
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-i3-0."
+image_prefix: "Macaroni-Phoenix-i3-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-kde-devel.yaml b/iso/mark-kde-devel.yaml
@@ -221,16 +221,14 @@ repository:
   - repository/mottainai-stable
   - repository/macaroni-phoenix
   - repository/macaroni-commons
-  #- repository/macaroni-phoenix-testing
-  #- repository/macaroni-commons-testing
   - repository/macaroni-security
 
 initramfs:
   kernel_file: "bzImage"
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-KDE-Devel-0."
+image_prefix: "Macaroni-Phoenix-KDE-Devel-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-kde-testing.yaml b/iso/mark-kde-testing.yaml
@@ -225,19 +225,16 @@ packages:
 # Repositories packages from repository-index
 repository:
   packages:
-  #- repository/mottainai-stable
   - repository/mottainai-testing
   - repository/macaroni-phoenix-testing
   - repository/macaroni-commons-testing
-  #- repository/macaroni-phoenix-dev
-  #- repository/macaroni-commons-dev
 
 initramfs:
   kernel_file: "bzImage"
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-KDE-Testing-0."
+image_prefix: "Macaroni-Phoenix-KDE-Testing-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-kde.yaml b/iso/mark-kde.yaml
@@ -221,8 +221,6 @@ packages:
 repository:
   packages:
   - repository/mottainai-stable
-  #- repository/macaroni-phoenix-testing
-  #- repository/macaroni-commons-testing
   - repository/macaroni-phoenix
   - repository/macaroni-commons
   - repository/macaroni-security
@@ -232,7 +230,7 @@ initramfs:
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-KDE-0."
+image_prefix: "Macaroni-Phoenix-KDE-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-live-testing.yaml b/iso/mark-live-testing.yaml
@@ -210,16 +210,14 @@ repository:
   - repository/mottainai-testing
   - repository/macaroni-funtoo-testing
   - repository/macaroni-commons-testing
-  #- repository/macaroni-funtoo-dev
-  #- repository/macaroni-commons-dev
   - repository/macaroni-security
 
 initramfs:
   kernel_file: "bzImage"
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Gnome-Live-Testing-0."
+image_prefix: "Macaroni-Phoenix-Gnome-Live-Testing-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-live-wayland-testing.yaml b/iso/mark-live-wayland-testing.yaml
@@ -209,16 +209,14 @@ repository:
   - repository/mottainai-testing
   - repository/macaroni-funtoo-testing
   - repository/macaroni-commons-testing
-  #- repository/macaroni-funtoo-dev
-  #- repository/macaroni-commons-dev
   - repository/macaroni-security
 
 initramfs:
   kernel_file: "bzImage"
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Gnome-Live-Wayland-Testing-0."
+image_prefix: "Macaroni-Phoenix-Gnome-Live-Wayland-Testing-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-live-wayland.yaml b/iso/mark-live-wayland.yaml
@@ -214,7 +214,7 @@ packages:
 repository:
   packages:
   - repository/mottainai-stable
-  - repository/macaroni-funtoo
+  - repository/macaroni-phoenix
   - repository/macaroni-commons
   - repository/macaroni-security
 
@@ -223,7 +223,7 @@ initramfs:
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Gnome-Live-Wayland-0."
+image_prefix: "Macaroni-Phoenix-Gnome-Live-Wayland-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-live.yaml b/iso/mark-live.yaml
@@ -222,7 +222,7 @@ repository:
   packages:
     #- repository/geaaru
   - repository/mottainai-stable
-  - repository/macaroni-funtoo
+  - repository/macaroni-phoenix
   - repository/macaroni-commons
   - repository/macaroni-security
 
@@ -231,7 +231,7 @@ initramfs:
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Gnome-Live-0."
+image_prefix: "Macaroni-Phoenix-Gnome-Live-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-lxqt-testing.yaml b/iso/mark-lxqt-testing.yaml
@@ -175,16 +175,12 @@ repository:
   - repository/macaroni-phoenix-testing
   - repository/macaroni-commons-testing
 
-  #- repository/macaroni-phoenix-dev
-  #- repository/macaroni-commons-dev
-  #- repository/macaroni-security-dev
-
 initramfs:
   kernel_file: "bzImage"
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-LXQt-Testing-0."
+image_prefix: "Macaroni-Phoenix-LXQt-Testing-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-lxqt.yaml b/iso/mark-lxqt.yaml
@@ -168,7 +168,7 @@ packages:
 repository:
   packages:
   - repository/mottainai-stable
-  - repository/macaroni-funtoo
+  - repository/macaroni-phoenix
   - repository/macaroni-commons
   - repository/macaroni-security
 
@@ -177,7 +177,7 @@ initramfs:
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-LXQt-0."
+image_prefix: "Macaroni-Phoenix-LXQt-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-server-devel.yaml b/iso/mark-server-devel.yaml
@@ -160,18 +160,16 @@ packages:
 repository:
   packages:
   - repository/mottainai-stable
-  - repository/macaroni-funtoo
-  #- repository/macaroni-funtoo-testing
+  - repository/macaroni-phoenix
   - repository/macaroni-commons
   - repository/macaroni-security
-  #- repository/macaroni-commons-testing
 
 initramfs:
   kernel_file: "bzImage"
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Server-Devel-0."
+image_prefix: "Macaroni-Phoenix-Server-Devel-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-server-testing.yaml b/iso/mark-server-testing.yaml
@@ -167,7 +167,7 @@ initramfs:
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Server-Testing-0."
+image_prefix: "Macaroni-Phoenix-Server-Testing-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-server.yaml b/iso/mark-server.yaml
@@ -158,7 +158,7 @@ packages:
 repository:
   packages:
   - repository/mottainai-stable
-  - repository/macaroni-funtoo
+  - repository/macaroni-phoenix
   - repository/macaroni-commons
   - repository/macaroni-security
 
@@ -167,7 +167,7 @@ initramfs:
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Server-0."
+image_prefix: "Macaroni-Phoenix-Server-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-xfce-devel.yaml b/iso/mark-xfce-devel.yaml
@@ -167,7 +167,7 @@ packages:
 repository:
   packages:
   - repository/mottainai-stable
-  - repository/macaroni-funtoo
+  - repository/macaroni-phoenix
   - repository/macaroni-commons
   - repository/macaroni-security
 
@@ -176,7 +176,7 @@ initramfs:
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Xfce-Devel-0."
+image_prefix: "Macaroni-Phoenix-Xfce-Devel-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-xfce-testing.yaml b/iso/mark-xfce-testing.yaml
@@ -163,17 +163,14 @@ repository:
   packages:
   - repository/mottainai-testing
   - repository/macaroni-phoenix-testing
-  #- repository/macaroni-phoenix-dev
   - repository/macaroni-commons-testing
-  #- repository/macaroni-commons-dev
-  #- repository/macaroni-security-dev
 
 initramfs:
   kernel_file: "bzImage"
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Xfce-Testing-0."
+image_prefix: "Macaroni-Phoenix-Xfce-Testing-0."
 image_date: "true"
 
 overlay_hooks:

diff --git a/iso/mark-xfce.yaml b/iso/mark-xfce.yaml
@@ -162,7 +162,7 @@ packages:
 repository:
   packages:
   - repository/mottainai-stable
-  - repository/macaroni-funtoo
+  - repository/macaroni-phoenix
   - repository/macaroni-commons
   - repository/macaroni-security
 
@@ -171,7 +171,7 @@ initramfs:
   rootfs_file: "Initrd"
 
 overlay: "true"
-image_prefix: "Macaroni-Funtoo-Phoenix-Xfce-0."
+image_prefix: "Macaroni-Phoenix-Xfce-0."
 image_date: "true"
 
 overlay_hooks: