From 041359c239c0fe5aaf78029cd9dc8bd67e93335a Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 17 2023 10:01:28 +0000
Subject: Kinoite: Add default Flatpaks to Kinoite installer


Add the following applications as Flatpaks to Kinoite installer images:
- Elisa
- Gwenview
- KMahjongg
- KMines
- KRDC
- Kcalc
- KoulourPaint
- Okular

Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/fedora.conf b/fedora.conf
index c8dc049..1b8ca9c 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -873,7 +873,8 @@ ostree_installer = [
             "release": None,
             "rootfs_size": "8",
             "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
-                             "ostree-based-installer/lorax-embed-repo.tmpl"],
+                             "ostree-based-installer/lorax-embed-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-flatpaks.tmpl"],
             "add_template_var": [
                 "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
                 "ostree_update_repo=https://ostree.fedoraproject.org",
@@ -886,7 +887,8 @@ ostree_installer = [
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
                 "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
-                "flatpak_remote_refs=",
+                # keeping them on the stable release until the flatpak sig confirms the next update
+                "flatpak_remote_refs=runtime/org.fedoraproject.KDE5Platform/x86_64/f39 app/org.kde.elisa/x86_64/stable app/org.kde.gwenview/x86_64/stable app/org.kde.kcalc/x86_64/stable app/org.kde.kmahjongg/x86_64/stable app/org.kde.kmines/x86_64/stable app/org.kde.kolourpaint/x86_64/stable app/org.kde.krdc/x86_64/stable app/org.kde.okular/x86_64/stable",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
             'template_branch': 'main',
@@ -899,7 +901,8 @@ ostree_installer = [
             "release": None,
             "rootfs_size": "8",
             "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
-                             "ostree-based-installer/lorax-embed-repo.tmpl"],
+                             "ostree-based-installer/lorax-embed-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-flatpaks.tmpl"],
             "add_template_var": [
                 "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
                 "ostree_update_repo=https://ostree.fedoraproject.org",
@@ -912,7 +915,8 @@ ostree_installer = [
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
                 "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
-                "flatpak_remote_refs=",
+                # keeping them on the stable release until the flatpak sig confirms the next update
+                "flatpak_remote_refs=runtime/org.fedoraproject.KDE5Platform/ppc64le/f39 app/org.kde.elisa/ppc64le/stable app/org.kde.gwenview/ppc64le/stable app/org.kde.kcalc/ppc64le/stable app/org.kde.kmahjongg/ppc64le/stable app/org.kde.kmines/ppc64le/stable app/org.kde.kolourpaint/ppc64le/stable app/org.kde.krdc/ppc64le/stable app/org.kde.okular/ppc64le/stable",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
             'template_branch': 'main',
@@ -925,7 +929,8 @@ ostree_installer = [
             "release": None,
             "rootfs_size": "8",
             "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
-                             "ostree-based-installer/lorax-embed-repo.tmpl"],
+                             "ostree-based-installer/lorax-embed-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-flatpaks.tmpl"],
             "add_template_var": [
                 "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
                 "ostree_update_repo=https://ostree.fedoraproject.org",
@@ -938,7 +943,8 @@ ostree_installer = [
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
                 "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
-                "flatpak_remote_refs=",
+                # keeping them on the stable release until the flatpak sig confirms the next update
+                "flatpak_remote_refs=runtime/org.fedoraproject.KDE5Platform/aarch64/f39 app/org.kde.elisa/aarch64/stable app/org.kde.gwenview/aarch64/stable app/org.kde.kcalc/aarch64/stable app/org.kde.kmahjongg/aarch64/stable app/org.kde.kmines/aarch64/stable app/org.kde.kolourpaint/aarch64/stable app/org.kde.krdc/aarch64/stable app/org.kde.okular/aarch64/stable",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
             'template_branch': 'main',