From bed72c37fb996263908c097c710ac271f4487ccb Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 19 2022 19:46:21 +0000
Subject: [PATCH 1/4] repos: Next version is 38 (for future branching)


Update repos (unused) to be ready for the next time we branch.

---

diff --git a/fedora-37-updates.repo b/fedora-37-updates.repo
deleted file mode 100644
index c5b65df..0000000
--- a/fedora-37-updates.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[fedora-37-updates]
-name=Fedora 37 $basearch Updates
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f37&arch=$basearch
-enabled=1
-gpgcheck=1
-metadata_expire=1d
diff --git a/fedora-37.repo b/fedora-37.repo
deleted file mode 100644
index 7e41cb3..0000000
--- a/fedora-37.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[fedora-37]
-name=Fedora 37 $basearch
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-37&arch=$basearch
-enabled=1
-gpgcheck=1
-metadata_expire=1d
diff --git a/fedora-38-updates.repo b/fedora-38-updates.repo
new file mode 100644
index 0000000..5da1acf
--- /dev/null
+++ b/fedora-38-updates.repo
@@ -0,0 +1,6 @@
+[fedora-38-updates]
+name=Fedora 38 $basearch Updates
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f38&arch=$basearch
+enabled=1
+gpgcheck=1
+metadata_expire=1d
diff --git a/fedora-38.repo b/fedora-38.repo
new file mode 100644
index 0000000..88b9361
--- /dev/null
+++ b/fedora-38.repo
@@ -0,0 +1,6 @@
+[fedora-38]
+name=Fedora 38 $basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-38&arch=$basearch
+enabled=1
+gpgcheck=1
+metadata_expire=1d

From a0383847e9e97c09973c0750e1a32da70b5a4c7e Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 08 2022 14:52:48 +0000
Subject: [PATCH 2/4] comps-sync f38 2022-09-08


---

diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 500fb8c..e243771 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -60,6 +60,7 @@ packages:
   - gnupg2
   - google-noto-emoji-color-fonts
   - google-noto-naskh-arabic-vf-fonts
+  - google-noto-sans-arabic-vf-fonts
   - google-noto-sans-armenian-vf-fonts
   - google-noto-sans-canadian-aboriginal-vf-fonts
   - google-noto-sans-cherokee-vf-fonts
@@ -122,8 +123,6 @@ packages:
   - liberation-mono-fonts
   - liberation-sans-fonts
   - liberation-serif-fonts
-  - libertas-sd8686-firmware
-  - libertas-sd8787-firmware
   - libertas-usb8388-firmware
   - libglvnd-gles
   - linux-firmware
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 2a14b78..24bc734 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -51,7 +51,7 @@ packages:
   - plasma-vault
   - plasma-workspace
   - plasma-workspace-geolocation
-  - plasma-workspace-xorg
+  - plasma-workspace-x11
   - polkit-kde
   - qt-at-spi
   - qt5-qtbase-gui

From 8bc8488ad392cdfd9ed1084a158285830f1c5113 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 08 2022 14:52:48 +0000
Subject: [PATCH 3/4] README: Minor update with more examples


---

diff --git a/README.md b/README.md
index 4efe7b2..f36953b 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,9 @@ Instructions to perform a local build of Silverblue:
 # Clone the config
 git clone https://pagure.io/workstation-ostree-config && cd workstation-ostree-config
 
-# Prepare repo & cache
-mkdir -p repo cache && ostree --repo=repo init --mode=archive
+# Prepare directories
+mkdir -p repo cache
+ostree --repo=repo init --mode=archive
 
 # Build (compose) the variant of your choice
 sudo rpm-ostree compose tree --repo=repo --cachedir=cache fedora-silverblue.yaml
@@ -45,12 +46,17 @@ ostree summary --repo=repo --update
 
 Instructions to test the resulting build:
 
-- First, serve the ostree repo using an HTTP server.
+- First, serve the ostree repo using an HTTP server. You can use any static file server. For example using <https://github.com/TheWaWaR/simple-http-server>:
+
+  ```
+  simple-http-server --index --ip 192.168.122.1 --port 8000
+  ```
+
 - Then, on an already installed Silverblue system:
 
 ```
 # Add an ostree remote
-sudo ostree remote add testremote http://<IP_ADDRESS>/repo
+sudo ostree remote add testremote http://192.168.122.1:8000/repo --no-gpg-verify
 
 # Pin the currently deployed (and probably working) version
 sudo ostree admin pin 0
@@ -59,7 +65,9 @@ sudo ostree admin pin 0
 sudo ostree remote refs testremote
 
 # Switch to your variant
-sudo rpm-ostree rebase testremote:fedora/35/x86_64/silverblue
+sudo rpm-ostree rebase testremote:fedora/rawhide/x86_64/silverblue
+
+# Reboot and test!
 ```
 
 ## Historical references

From a0c3b97ad8538e10387904abcd422300aa9cb6eb Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 08 2022 14:52:48 +0000
Subject: [PATCH 4/4] validate: Skip build directories


---

diff --git a/ci/validate b/ci/validate
index a78b4f7..1e9b6c9 100755
--- a/ci/validate
+++ b/ci/validate
@@ -21,9 +21,10 @@ def validate_shell(rootfd, name):
 
 
 for root, dirs, files, rootfd in os.fwalk('.'):
-    # Skip .git
-    if '.git' in dirs:
-        dirs.remove('.git')
+    # Skip .git, repo, cache, tmp, logs, fedora-comps
+    for d in ['.git', 'repo', 'cache', 'tmp', 'logs', 'fedora-comps']:
+        if d in dirs:
+            dirs.remove(d)
     for name in files:
         if name.endswith(('.yaml', '.yml')):
             print("Validating:", name)