From 906ef6941640cf67eda447d9bb7da998ae252db8 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: May 16 2022 15:03:45 +0000
Subject: [PATCH 1/3] README: Minor update


---

diff --git a/README.md b/README.md
index 25e27d2..2eb5265 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-# ostree 
+# Fedora IoT ostree/rpm-ostree treefiles
 
 This is the repo for the ostree compose configs for Fedora IoT.

From 603a779550c50b7d09624132837be5377a87a494 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: May 16 2022 15:03:45 +0000
Subject: [PATCH 2/3] Remove fedora-iot-rawhide.tdl & fedora-iot.spec


- fedora-iot-rawhide.tdl has out of date content
- fedora-iot.spec: support for jigdo/rojig was dropped from rpm-ostree.
  See: https://github.com/coreos/rpm-ostree/pull/2841 &
  https://github.com/coreos/rpm-ostree/pull/2842

---

diff --git a/fedora-iot-rawhide.tdl b/fedora-iot-rawhide.tdl
deleted file mode 100644
index 8ad38cb..0000000
--- a/fedora-iot-rawhide.tdl
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-    <name>rawhide</name>
-    <os>
-        <name>Fedora</name>
-        <version>20</version>
-        <arch>x86_64</arch>
-        <install type='url'>
-            <url>http://dl.fedoraproject.org/pub/fedora/linux/development/22/x86_64/os/</url>
-        </install>
-        <rootpw>ewwwwwww</rootpw>
-    </os>
-</template>
-
diff --git a/fedora-iot.spec b/fedora-iot.spec
deleted file mode 100644
index f8b12a5..0000000
--- a/fedora-iot.spec
+++ /dev/null
@@ -1,22 +0,0 @@
-# Suppress most build root processing since we are just carrying binary data
-%global __os_install_post /usr/lib/rpm/brp-compress %{nil}
-Name: fedora-iot
-Version:	%{ostree_version}
-Release:	1%{?dist}
-Summary:	Image (rpm-ostree jigdo) for Fedora IoT
-License:	MIT
-#@@@rpmostree_jigdo_meta@@@
-
-%description
-%{summary}
-
-%prep
-
-%build
-
-%install
-mkdir -p %{buildroot}%{_prefix}/lib/ostree-jigdo/%{name}
-for x in *; do mv ${x} %{buildroot}%{_prefix}/lib/ostree-jigdo/%{name}; done
-
-%files
-%{_prefix}/lib/ostree-jigdo/%{name}

From 179518bbab031d6c523ffaff66bae88a2e11ed0d Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: May 16 2022 15:03:45 +0000
Subject: [PATCH 3/3] fedora-iot-base: Update persistent journal workaround


Add a systemd configuration drop-in instead of modyfing the default
configuration file.

Imported from:
https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf

---

diff --git a/treecompose-post.sh b/treecompose-post.sh
index 81d6c5e..4b86bf3 100755
--- a/treecompose-post.sh
+++ b/treecompose-post.sh
@@ -2,12 +2,8 @@
 
 set -xeuo pipefail
 
-# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295
-# Also note the create-new-then-rename dance for rofiles-fuse compat
-if ! grep -q '^Storage=persistent' /etc/systemd/journald.conf; then
-    (cat /etc/systemd/journald.conf && echo 'Storage=persistent') > /etc/systemd.journald.conf.new
-    mv /etc/systemd.journald.conf{.new,}
-fi
+# From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf
+echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf
 
 # See: https://src.fedoraproject.org/rpms/glibc/pull-request/4
 # Basically that program handles deleting old shared library directories