From fce34fbbc659e795b0bf277c36ac7afb849129f3 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 19 2024 13:52:18 +0000
Subject: [PATCH 1/4] README: Update branching instructions


- Tell sed to follow symlinks insteads of creating new copies of files.
- Fix glob for rawhide repo removal sed call

---

diff --git a/README.md b/README.md
index fe1a064..8add76a 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ Make a PR similar to
 ```
 sed -i "s/42/43/g" *.repo comps-sync.py
 sed -i "s/releasever: 42/releasever: 43/" common.yaml
-sed -i "s/# - fedora-42/# - fedora-43/" *.yaml
+sed -i --follow-symlinks "s/# - fedora-42/# - fedora-43/" *.yaml
 mv fedora-42.repo fedora-43.repo
 mv fedora-42-updates.repo fedora-43-updates.repo
 sed -i "s/43/44/g" README.md
@@ -199,9 +199,9 @@ sed -i "s/42/43/g" README.md
 
 ```
 rm fedora-rawhide.repo
-sed -i "/- fedora-rawhide/d" fedora-*.yaml
-sed -i "s/# - fedora-42/- fedora-42/" *.yaml
-sed -i "s/ref: fedora\/rawhide/ref: fedora\/42/" *.yaml
+sed -i --follow-symlinks "/- fedora-rawhide/d" *.yaml
+sed -i --follow-symlinks "s/# - fedora-42/- fedora-42/" *.yaml
+sed -i --follow-symlinks "s/ref: fedora\/rawhide/ref: fedora\/42/" *.yaml
 ```
 
 ## Historical references

From 84c558c67fa4a6837f0aaaa12e83b21ecd21e2b1 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 19 2024 13:52:18 +0000
Subject: [PATCH 2/4] Fix un-symlinked manifests from branching


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

---

diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
deleted file mode 100644
index 6d15d96..0000000
--- a/fedora-kinoite.yaml
+++ /dev/null
@@ -1,11 +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-rawhide
-  # - fedora-42
-  # - fedora-42-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 c1daffc..0000000
--- a/fedora-onyx.yaml
+++ /dev/null
@@ -1,11 +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-rawhide
-  # - fedora-42
-  # - fedora-42-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 cb2d108..0000000
--- a/fedora-sericea.yaml
+++ /dev/null
@@ -1,11 +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-rawhide
-  # - fedora-42
-  # - fedora-42-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 fcf059a..0000000
--- a/fedora-silverblue.yaml
+++ /dev/null
@@ -1,11 +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-rawhide
-  # - fedora-42
-  # - fedora-42-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 a4d4263ee8315d8ba3d181e779817971e3185996 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 19 2024 17:51:53 +0000
Subject: [PATCH 3/4] 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 29a43767df51d965c4eb7f767789a71f83dc8d11 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 20 2024 08:41:14 +0000
Subject: [PATCH 4/4] comps-sync f42 2024-08-20


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

