From d7fba827f9d66441ad4a9e6264d0ae31c3a2bcd5 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 14 Aug 2019 12:57:07 +0100
Subject: [PATCH 1/7] setup for F-31 branched

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 config.ini                      | 4 ++--
 fedora-iot-base.json            | 2 +-
 fedora-iot-rawhide.tdl          | 2 +-
 fedora-iot-updates-testing.json | 2 +-
 fedora-iot.json                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.ini b/config.ini
index 45ff24a..50c919f 100644
--- a/config.ini
+++ b/config.ini
@@ -11,8 +11,8 @@ tree_name   = docker-host
 tree_file   = %(os_name)s-%(tree_name)s.json
 arch        = x86_64
 release     = f31
-ref         = %(os_name)s/rawhide/%(arch)s/%(tree_name)s
-yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/rawhide/%(arch)s/os/
+ref         = %(os_name)s/devel/%(arch)s/%(tree_name)s
+yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/branched/%(arch)s/os/
 # lorax_additional_repos = http://127.0.0.1/fedora-iot/local-overrides
 lorax_include_packages = fedora-productimg-iot
 docker_os_name = fedora
diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index bf5ca32..a851b49 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/rawhide/${basearch}/iot",
+    "ref": "fedora/devel/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
 
     "repos": [],
diff --git a/fedora-iot-rawhide.tdl b/fedora-iot-rawhide.tdl
index 8ad38cb..9d4056b 100644
--- a/fedora-iot-rawhide.tdl
+++ b/fedora-iot-rawhide.tdl
@@ -1,5 +1,5 @@
 <template>
-    <name>rawhide</name>
+    <name>branched</name>
     <os>
         <name>Fedora</name>
         <version>20</version>
diff --git a/fedora-iot-updates-testing.json b/fedora-iot-updates-testing.json
index 96b50ac..d0b3866 100644
--- a/fedora-iot-updates-testing.json
+++ b/fedora-iot-updates-testing.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/rawhide/${basearch}/testing/iot",
+    "ref": "fedora/devel/${basearch}/testing/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
     "include": "fedora-iot-base.json"
 }
diff --git a/fedora-iot.json b/fedora-iot.json
index d9f8e40..a6d63d8 100644
--- a/fedora-iot.json
+++ b/fedora-iot.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/rawhide/${basearch}/iot",
+    "ref": "fedora/devel/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
     "repos": ["fedora-31"],
     "include": "fedora-iot-base.json"

From 9c131e8c9dd94d23c1ee7651354da6b2072216c3 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 27 Aug 2019 19:12:52 +0100
Subject: [PATCH 2/7] fwupdate packages are now merged into fwupd

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 fedora-iot-base.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index a851b49..dd74b8a 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -115,15 +115,13 @@
 
     "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64",
                          "uboot-tools", "uboot-images-armv8", "bcm283x-firmware",
-                         "fwupdate", "fwupdate-efi", "arm-image-installer",
-                         "iwl7260-firmware"],
+                         "arm-image-installer", "iwl7260-firmware"],
 
     "packages-armhfp": ["grub2-efi-arm", "efibootmgr",
                         "uboot-tools", "uboot-images-armv7", "bcm283x-firmware",
                         "arm-image-installer"],
 
-    "packages-x86_64": ["grub2", "grub2-efi-x64", "efibootmgr", "shim-x64",
-                        "fwupdate", "fwupdate-efi", "microcode_ctl",
+    "packages-x86_64": ["grub2", "grub2-efi-x64", "efibootmgr", "shim-x64", "microcode_ctl",
                         "iwl1000-firmware", "iwl100-firmware", "iwl105-firmware", "iwl135-firmware",
                         "iwl2000-firmware", "iwl2030-firmware", "iwl3160-firmware", "iwl5000-firmware",
                         "iwl5150-firmware", "iwl6000-firmware", "iwl6050-firmware", "iwl7260-firmware"],

From 4cf81fb82976a96373c014114e015948484ebef0 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 27 Aug 2019 23:12:35 +0100
Subject: [PATCH 3/7] Explicitly add wpa_supplicant and iwd

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 fedora-iot-base.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index dd74b8a..624a72b 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -89,6 +89,7 @@
          "curl",
          "firewalld", "iptables",
          "NetworkManager", "NetworkManager-wifi", "NetworkManager-wwan",
+         "wpa_supplicant", "iwd",
          "dnsmasq", "traceroute",
          "hostname", "iproute", "iputils",
          "openssh-clients", "openssh-server", "passwd",

From b51a5c38b7d7c5fb5962aba7b282799868c6bacd Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 27 Oct 2019 13:18:41 +0000
Subject: [PATCH 4/7] move F-31 to stable ostree branch

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 config.ini                      | 4 ++--
 fedora-iot-base.json            | 2 +-
 fedora-iot-updates-stable.json  | 2 +-
 fedora-iot-updates-testing.json | 2 +-
 fedora-iot.json                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.ini b/config.ini
index 50c919f..f4c2eda 100644
--- a/config.ini
+++ b/config.ini
@@ -11,8 +11,8 @@ tree_name   = docker-host
 tree_file   = %(os_name)s-%(tree_name)s.json
 arch        = x86_64
 release     = f31
-ref         = %(os_name)s/devel/%(arch)s/%(tree_name)s
-yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/branched/%(arch)s/os/
+ref         = %(os_name)s/stable/%(arch)s/%(tree_name)s
+yum_baseurl = https://dl.fedoraproject.org/pub/fedora/linux/releases/31/Everything/%(arch)s/os/
 # lorax_additional_repos = http://127.0.0.1/fedora-iot/local-overrides
 lorax_include_packages = fedora-productimg-iot
 docker_os_name = fedora
diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index 624a72b..4eac617 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/devel/${basearch}/iot",
+    "ref": "fedora/stable/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
 
     "repos": [],
diff --git a/fedora-iot-updates-stable.json b/fedora-iot-updates-stable.json
index 1bacd21..aeb0024 100644
--- a/fedora-iot-updates-stable.json
+++ b/fedora-iot-updates-stable.json
@@ -1,5 +1,5 @@
 
-    "ref": "fedora/devel/${basearch}/updates/iot",
+    "ref": "fedora/stable/${basearch}/updates/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
     "include": "fedora-iot-base.json"
 }
diff --git a/fedora-iot-updates-testing.json b/fedora-iot-updates-testing.json
index d0b3866..5d008fe 100644
--- a/fedora-iot-updates-testing.json
+++ b/fedora-iot-updates-testing.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/devel/${basearch}/testing/iot",
+    "ref": "fedora/stable/${basearch}/testing/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
     "include": "fedora-iot-base.json"
 }
diff --git a/fedora-iot.json b/fedora-iot.json
index a6d63d8..8370f3d 100644
--- a/fedora-iot.json
+++ b/fedora-iot.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/devel/${basearch}/iot",
+    "ref": "fedora/stable/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
     "repos": ["fedora-31"],
     "include": "fedora-iot-base.json"

From af65d321260d44d37690edfde802ec8626cfec7d Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 24 Sep 2019 16:39:23 +0100
Subject: [PATCH 5/7] add bluetooth mesh subpackage

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 fedora-iot-base.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index 4eac617..8cba630 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -107,7 +107,7 @@
          "policycoreutils-python-utils",
          "setools-console",
          "audit", "rng-tools",
-         "bluez", "bluez-libs", "wpan-tools",
+         "bluez", "bluez-libs", "bluez-mesh", "wpan-tools",
          "kernel-tools", "libgpiod-utils",
          "podman", "container-selinux", "skopeo", "criu",
 	 "slirp4netns",

From 9ffeef447aa6d936c0d691b6cce4be46d93ed1c1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Fri, 15 Nov 2019 12:20:08 +0000
Subject: [PATCH 6/7] authconfig has been retired

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 fedora-iot-base.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index 8cba630..5a6b7e0 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -77,7 +77,7 @@
          "rpm-ostree", "polkit", "lvm2",
          "chrony", "zram",
          "cryptsetup", "pinentry",
-         "authconfig", "keyutils",
+         "keyutils",
          "e2fsprogs",
          "gnupg2",
          "basesystem",

From 41105d3ca5f185dde51cbc88611eb0860bfd8707 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Fri, 17 Jan 2020 05:27:03 +0000
Subject: [PATCH 7/7] add xfsprogs and dosfstools

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 fedora-iot-base.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index 5a6b7e0..36d0350 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -78,7 +78,7 @@
          "chrony", "zram",
          "cryptsetup", "pinentry",
          "keyutils",
-         "e2fsprogs",
+         "e2fsprogs", "xfsprogs", "dosfstools",
          "gnupg2",
          "basesystem",
          "python3",