From 9a1ecc205ccfdc79b1db0d3f8d8ffb156875da98 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 14 Aug 2023 13:57:25 -0400 Subject: [PATCH 1/7] Setup for F-39 branched Signed-off-by: Paul Whalen --- 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 7032043..b65ecee 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 = f39 -ref = %(os_name)s/rawhide/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/%(arch)s/os/ +ref = %(os_name)s/devel/%(arch)s/%(tree_name)s +yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/39/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 2b670e1..29d07dc 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-updates-stable.json b/fedora-iot-updates-stable.json index a3fb5ed..1bacd21 100644 --- a/fedora-iot-updates-stable.json +++ b/fedora-iot-updates-stable.json @@ -1,5 +1,5 @@ - "ref": "fedora/rawhide/${basearch}/updates/iot", + "ref": "fedora/devel/${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 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 7e8c051..450ab2a 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-39"], "include": "fedora-iot-base.json" From 5db8e68e14d9b1ed6d1b0def6d5aa56d30d44456 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 25 Oct 2023 16:38:48 +0100 Subject: [PATCH 2/7] Add criu-libs as criu doesn't pull it in Signed-off-by: Peter Robinson --- 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 29d07dc..3c2af23 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -90,7 +90,7 @@ "containernetworking-plugins", "coreutils", "cracklib-dicts", - "criu", + "criu", "criu-libs", "cryptsetup", "curl", "dbus-parsec", From a6ea673e7f9a5983cbe4b73af3059e30750a9ec5 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 1 Nov 2023 12:23:34 -0400 Subject: [PATCH 3/7] Update F39 for GA Signed-off-by: Paul Whalen --- 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 b65ecee..7272289 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 = f39 -ref = %(os_name)s/devel/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/39/Everything/%(arch)s/os/ +ref = %(os_name)s/stable/%(arch)s/%(tree_name)s +yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/releases/39/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 3c2af23..765fcb9 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 450ab2a..dfc4aa9 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-39"], "include": "fedora-iot-base.json" From 8d9d549e35471d9922a96e739061842d959e9eab Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 8 Nov 2023 13:13:27 +0000 Subject: [PATCH 4/7] Enable IMA signatures Signed-off-by: Peter Robinson --- fedora-iot-base.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 765fcb9..a1b25f7 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -6,6 +6,8 @@ "selinux": true, + "ima": true, + "tmp-is-dir": true, "recommends": false, From 00fe16217a9b0f753ff9c9a6d3ec135fdd799d8b Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 5 Feb 2024 12:17:39 -0500 Subject: [PATCH 5/7] Add fedora-iot-config to packages Signed-off-by: Paul Whalen --- fedora-iot-base.json | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index a1b25f7..b6bf632 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -103,6 +103,7 @@ "e2fsprogs", "efibootmgr", "fdo-client", + "fedora-iot-config", "firewalld", "fwupd", "fwupd-efi", From b0e7f3ad6770cbc114d7b19ae0f8df14d878e9f7 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 7 Feb 2024 10:50:53 -0500 Subject: [PATCH 6/7] Revert "Add fedora-iot-config to packages" This reverts commit 00fe16217a9b0f753ff9c9a6d3ec135fdd799d8b. Due to issues with adding the fedora-iot-config. --- fedora-iot-base.json | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index b6bf632..a1b25f7 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -103,7 +103,6 @@ "e2fsprogs", "efibootmgr", "fdo-client", - "fedora-iot-config", "firewalld", "fwupd", "fwupd-efi", From 461f6e4d7d9eab5f899b396d981c5ce7a59b2f75 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 26 Feb 2024 12:49:23 -0500 Subject: [PATCH 7/7] Enable fedora-iot-config-remote-fix.service Signed-off-by: Paul Whalen --- fedora-iot-base.json | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index a1b25f7..e882706 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -188,6 +188,7 @@ "default_target": "multi-user.target", "units": ["NetworkManager.service", + "fedora-iot-config-remote-fix.service", "firewalld.service", "sshd.service", "greenboot-grub2-set-counter.service",