From 91a32b0ee9e97c6f81bde94bba4ff13cb4ff3031 Mon Sep 17 00:00:00 2001 From: Daniele Rondina Date: Sun, 20 Oct 2024 15:07:24 +0200 Subject: [PATCH] iso: Review image name --- iso/mark-dev.yaml | 6 +----- iso/mark-gnome-devel.yaml | 6 +----- iso/mark-i3-testing.yaml | 4 ++-- iso/mark-i3.yaml | 4 ++-- iso/mark-kde-devel.yaml | 4 +--- iso/mark-kde-testing.yaml | 5 +---- iso/mark-kde.yaml | 4 +--- iso/mark-live-testing.yaml | 4 +--- iso/mark-live-wayland-testing.yaml | 4 +--- iso/mark-live-wayland.yaml | 4 ++-- iso/mark-live.yaml | 4 ++-- iso/mark-lxqt-testing.yaml | 6 +----- iso/mark-lxqt.yaml | 4 ++-- iso/mark-server-devel.yaml | 6 ++---- iso/mark-server-testing.yaml | 2 +- iso/mark-server.yaml | 4 ++-- iso/mark-xfce-devel.yaml | 4 ++-- iso/mark-xfce-testing.yaml | 5 +---- iso/mark-xfce.yaml | 4 ++-- 19 files changed, 28 insertions(+), 56 deletions(-) diff --git a/iso/mark-dev.yaml b/iso/mark-dev.yaml index aefc38c4fe..cbb0756868 100644 --- a/iso/mark-dev.yaml +++ b/iso/mark-dev.yaml @@ -162,10 +162,6 @@ 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: @@ -173,7 +169,7 @@ initramfs: 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 index f73134c007..31cdcf47c2 100644 --- 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 index bce430595f..3e51bb04c9 100644 --- a/iso/mark-i3-testing.yaml +++ b/iso/mark-i3-testing.yaml @@ -153,7 +153,7 @@ packages: repository: packages: - repository/mottainai-testing - - repository/macaroni-funtoo-testing + - repository/macaroni-phoenix-testing - repository/macaroni-commons-testing initramfs: @@ -161,7 +161,7 @@ initramfs: 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 index 2183c5b1a7..6975fd9578 100644 --- 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 index 22595a1b17..e7708a6756 100644 --- a/iso/mark-kde-devel.yaml +++ b/iso/mark-kde-devel.yaml @@ -221,8 +221,6 @@ repository: - repository/mottainai-stable - repository/macaroni-phoenix - repository/macaroni-commons - #- repository/macaroni-phoenix-testing - #- repository/macaroni-commons-testing - repository/macaroni-security initramfs: @@ -230,7 +228,7 @@ initramfs: 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 index b62abe9252..b34cbe93ca 100644 --- 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 index 05dd69ef13..25dc8eefa2 100644 --- 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 index ff565beb45..fb4e09ff00 100644 --- a/iso/mark-live-testing.yaml +++ b/iso/mark-live-testing.yaml @@ -210,8 +210,6 @@ repository: - repository/mottainai-testing - repository/macaroni-funtoo-testing - repository/macaroni-commons-testing - #- repository/macaroni-funtoo-dev - #- repository/macaroni-commons-dev - repository/macaroni-security initramfs: @@ -219,7 +217,7 @@ initramfs: 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 index 73afc38233..e1a819ee1c 100644 --- a/iso/mark-live-wayland-testing.yaml +++ b/iso/mark-live-wayland-testing.yaml @@ -209,8 +209,6 @@ repository: - repository/mottainai-testing - repository/macaroni-funtoo-testing - repository/macaroni-commons-testing - #- repository/macaroni-funtoo-dev - #- repository/macaroni-commons-dev - repository/macaroni-security initramfs: @@ -218,7 +216,7 @@ initramfs: 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 index 814eaf5772..1aca1af435 100644 --- 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 index 2ca1ca09e1..ea8c3ac3fc 100644 --- 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 index b4f883caf8..d736f7c06a 100644 --- 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 index e97ac390c5..00312182e6 100644 --- 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 index de3387c46b..bda4e6ba96 100644 --- 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 index d265bc204c..80e82f5c2d 100644 --- 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 index 42efa7241b..8585eac613 100644 --- 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 index 096f7a2dcc..51c38a0894 100644 --- 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 index fc66816f57..0a30f57573 100644 --- 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 index a87c1b40cd..ff279b344c 100644 --- 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: