From 223eaf284f481a8ae645f956f3ab5c8c484facc9 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 19 2024 14:10:21 +0000
Subject: [PATCH 1/3] Fix un-symlinked manifests from branching


Fixes: https://pagure.io/workstation-ostree-config/pull-request/547

---

diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
deleted file mode 100644
index 8b043db..0000000
--- a/fedora-kinoite.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-variables:
-  bootable_container: false
-
-include:
-  - kinoite-common.yaml
-
-# Kept in the leaf manifest as they are overwritten by Pungi in composes
-repos:
-  - fedora-41
-  - fedora-41-updates
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
new file mode 120000
index 0000000..c2542a6
--- /dev/null
+++ b/fedora-kinoite.yaml
@@ -0,0 +1 @@
+kinoite-ostree.yaml
\ No newline at end of file
diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml
deleted file mode 100644
index 98d06d4..0000000
--- a/fedora-onyx.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-variables:
-  bootable_container: false
-
-include:
-  - budgie-atomic-common.yaml
-
-# Kept in the leaf manifest as they are overwritten by Pungi in composes
-repos:
-  - fedora-41
-  - fedora-41-updates
diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml
new file mode 120000
index 0000000..f9283ac
--- /dev/null
+++ b/fedora-onyx.yaml
@@ -0,0 +1 @@
+budgie-atomic-ostree.yaml
\ No newline at end of file
diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml
deleted file mode 100644
index 59fde57..0000000
--- a/fedora-sericea.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-variables:
-  bootable_container: false
-
-include:
-  - sway-atomic-common.yaml
-
-# Kept in the leaf manifest as they are overwritten by Pungi in composes
-repos:
-  - fedora-41
-  - fedora-41-updates
diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml
new file mode 120000
index 0000000..0728c62
--- /dev/null
+++ b/fedora-sericea.yaml
@@ -0,0 +1 @@
+sway-atomic-ostree.yaml
\ No newline at end of file
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
deleted file mode 100644
index 7131d3e..0000000
--- a/fedora-silverblue.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-variables:
-  bootable_container: false
-
-include:
-  - silverblue-common.yaml
-
-# Kept in the leaf manifest as they are overwritten by Pungi in composes
-repos:
-  - fedora-41
-  - fedora-41-updates
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
new file mode 120000
index 0000000..0c5ed77
--- /dev/null
+++ b/fedora-silverblue.yaml
@@ -0,0 +1 @@
+silverblue-ostree.yaml
\ No newline at end of file

From 6467c0ab326d482022509e6ba9b8cca5b1220b19 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 19 2024 17:55:19 +0000
Subject: [PATCH 2/3] ci: Temporarily skip building the base variant


The Fedora 40 cloud images are currently limited in disk space in
SoftwareFactory. Let's only check for dependencies for now until this is
fixed.

See: https://pagure.io/fedora-ci/general/issue/488

---

diff --git a/ci/validate.yaml b/ci/validate.yaml
index be7ae1b..36799ce 100644
--- a/ci/validate.yaml
+++ b/ci/validate.yaml
@@ -86,10 +86,15 @@
       # Still run the next step if this one fails
       ignore_errors: true
 
-    - name: Compose the base variant
-      ansible.builtin.command:
+    - name: Perform dependency resolution for the base variant
+      ansible.builtin.shell:
         chdir: "{{ zuul.project.src_dir }}"
-        cmd: just compose-image base-atomic
+        cmd: "just compose-dry-run base-atomic"
+
+    # - name: Compose the base variant
+    #   ansible.builtin.command:
+    #     chdir: "{{ zuul.project.src_dir }}"
+    #     cmd: just compose-image base-atomic
 
     - name: Check if any previous dependency resolution steps failed
       ansible.builtin.shell:

From 415ac443111f399e8cbf5240477c318fc8d510d6 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 20 2024 08:46:06 +0000
Subject: [PATCH 3/3] comps-sync f41 2024-08-20


See: See: https://pagure.io/fedora-comps/pull-request/1006

---

diff --git a/kinoite-packages.yaml b/kinoite-packages.yaml
index 42918ec..a53d907 100644
--- a/kinoite-packages.yaml
+++ b/kinoite-packages.yaml
@@ -25,6 +25,7 @@ packages:
   - kde-settings-pulseaudio
   - kdebugsettings
   - kdegraphics-thumbnailers
+  - kdenetwork-filesharing
   - kdeplasma-addons
   - kdialog
   - kdnssd
@@ -70,6 +71,7 @@ packages:
   - plasma-workspace-wayland
   - plymouth-system-theme
   - polkit-kde
+  - samba-usershares
   - sddm
   - sddm-breeze
   - sddm-kcm