From e633ff2814050007d4645d52ffbcde30de596d2a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 17 Aug 2020 09:20:29 +0100 Subject: [PATCH 01/11] Setup for F-33 branched Signed-off-by: Peter Robinson --- config.ini | 4 ++-- fedora-32.repo => fedora-33.repo | 0 fedora-iot-base.json | 2 +- fedora-iot-updates-testing.json | 2 +- fedora-iot.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename fedora-32.repo => fedora-33.repo (100%) diff --git a/config.ini b/config.ini index 3d79dfc..5a27098 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 = f33 -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/33/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-32.repo b/fedora-33.repo similarity index 100% rename from fedora-32.repo rename to fedora-33.repo diff --git a/fedora-iot-base.json b/fedora-iot-base.json index bd18a09..9ed1431 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-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 3892dcc..8518094 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-33"], "include": "fedora-iot-base.json" From 48617f2eaa39bbeb63bb152f042ad99ea60c0dcf Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 24 Aug 2020 13:16:12 +0100 Subject: [PATCH 02/11] Add new clevis tpm2 pin 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 9ed1431..9efc704 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -107,7 +107,7 @@ "kernel-tools", "libgpiod-utils", "podman", "container-selinux", "skopeo", "criu", "slirp4netns", "fuse-overlayfs", - "clevis", "clevis-dracut", "clevis-luks"], + "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2"], "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "uboot-tools", "uboot-images-armv8", "bcm283x-firmware", From ae2821f910411db3d7f009ec07fc19649f7def1a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 16 Sep 2020 14:13:41 +0100 Subject: [PATCH 03/11] Add and enable parsec/dbus-parsec, minor tweaks Signed-off-by: Peter Robinson --- fedora-iot-base.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 9efc704..dd96d27 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -103,11 +103,12 @@ "policycoreutils-python-utils", "setools-console", "audit", "rng-tools", "chrony", - "bluez", "bluez-libs", "bluez-mesh", "wpan-tools", + "bluez", "bluez-libs", "bluez-mesh", "kernel-tools", "libgpiod-utils", "podman", "container-selinux", "skopeo", "criu", - "slirp4netns", "fuse-overlayfs", - "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2"], + "slirp4netns", "fuse-overlayfs", + "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", + "parsec", "dbus-parsec"], "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "uboot-tools", "uboot-images-armv8", "bcm283x-firmware", @@ -127,5 +128,6 @@ "units": ["NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service", "zezere_ignition.timer", "zezere_ignition_banner.service", "greenboot-grub2-set-counter", "greenboot-grub2-set-success", "greenboot-healthcheck", "greenboot-rpm-ostree-grub2-check-fallback", - "greenboot-status", "greenboot-task-runner", "redboot-auto-reboot", "edboot-task-runner"] + "greenboot-status", "greenboot-task-runner", "redboot-auto-reboot", "edboot-task-runner", + "parsec", "dbus-parsec"] } From bcc9459ea2e69c5086c48c637ed3016d870e6fc5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 17 Sep 2020 09:04:33 +0100 Subject: [PATCH 04/11] Add tpm2-abrmd 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 dd96d27..aac0735 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -108,7 +108,7 @@ "podman", "container-selinux", "skopeo", "criu", "slirp4netns", "fuse-overlayfs", "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", - "parsec", "dbus-parsec"], + "parsec", "dbus-parsec", "tpm2-abrmd"], "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "uboot-tools", "uboot-images-armv8", "bcm283x-firmware", From 413eb752e3ff3d62ed3e036737fce1609b472c7d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 17 Sep 2020 14:28:04 +0100 Subject: [PATCH 05/11] Revert "Add tpm2-abrmd" This reverts commit bcc9459ea2e69c5086c48c637ed3016d870e6fc5. 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 aac0735..dd96d27 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -108,7 +108,7 @@ "podman", "container-selinux", "skopeo", "criu", "slirp4netns", "fuse-overlayfs", "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", - "parsec", "dbus-parsec", "tpm2-abrmd"], + "parsec", "dbus-parsec"], "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "uboot-tools", "uboot-images-armv8", "bcm283x-firmware", From 0a385eb766e2c524dd7d707aa7746436640b5b5a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 30 Sep 2020 12:30:43 +0100 Subject: [PATCH 06/11] fix typo in redboot service 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 dd96d27..bc00392 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -128,6 +128,6 @@ "units": ["NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service", "zezere_ignition.timer", "zezere_ignition_banner.service", "greenboot-grub2-set-counter", "greenboot-grub2-set-success", "greenboot-healthcheck", "greenboot-rpm-ostree-grub2-check-fallback", - "greenboot-status", "greenboot-task-runner", "redboot-auto-reboot", "edboot-task-runner", + "greenboot-status", "greenboot-task-runner", "redboot-auto-reboot", "redboot-task-runner", "parsec", "dbus-parsec"] } From af704d8e887ffda746cf98c87c10aff59341f6ff Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 8 Oct 2020 18:33:33 +0100 Subject: [PATCH 07/11] Add podman-plugins as it's not pulled in now 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 bc00392..e617284 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -105,7 +105,7 @@ "audit", "rng-tools", "chrony", "bluez", "bluez-libs", "bluez-mesh", "kernel-tools", "libgpiod-utils", - "podman", "container-selinux", "skopeo", "criu", + "podman", "podman-plugins", "container-selinux", "skopeo", "criu", "slirp4netns", "fuse-overlayfs", "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", "parsec", "dbus-parsec"], From cf89d27ad4edc6652fbea5929d87d262424d43f2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 28 Oct 2020 14:11:08 +0000 Subject: [PATCH 08/11] move F-33 to stable ostree branch Signed-off-by: Peter Robinson --- 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 5a27098..a77cb73 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 = f33 -ref = %(os_name)s/devel/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/33/Everything/%(arch)s/os/ +ref = %(os_name)s/stable/%(arch)s/%(tree_name)s +yum_baseurl = https://dl.fedoraproject.org/pub/fedora/linux/releases/33/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 e617284..15ef7da 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 8518094..a21eb9f 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-33"], "include": "fedora-iot-base.json" From 6fb322fa3b81cc32407a6b018fbf01ef37e66a74 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 19 Dec 2020 11:35:36 +0000 Subject: [PATCH 09/11] add openssl option explicitly to allow for certificate pieces 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 15ef7da..52d776c 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -97,7 +97,7 @@ "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status", "ignition", "zezere-ignition", "rsync", "attr", - "ima-evm-utils", + "ima-evm-utils", "openssl", "bash-completion", "tmux", "screen", "policycoreutils-python-utils", From 80e5883a5cff8c02cdf5df4b75b0c96592e3052a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 31 Dec 2020 10:57:36 +0000 Subject: [PATCH 10/11] Add wireless-regdb to ensure wireless location can be set 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 52d776c..c38143a 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -85,7 +85,7 @@ "coreutils", "which", "curl", "firewalld", "iptables", "NetworkManager", "NetworkManager-wifi", "NetworkManager-wwan", - "wpa_supplicant", "iwd", "tpm2-pkcs11", + "wpa_supplicant", "wireless-regdb", "iwd", "tpm2-pkcs11", "dnsmasq", "traceroute", "hostname", "iproute", "iputils", "openssh-clients", "openssh-server", "passwd", From 2081789dbbbff087b2cebd2a024dd434d4d512f2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 14 Feb 2021 11:57:05 +0000 Subject: [PATCH 11/11] Add zram-generator, zram-generator-defaults which replace zram Signed-off-by: Peter Robinson --- fedora-iot-base.json | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index c38143a..b07b986 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -96,6 +96,7 @@ "fwupd", "usbguard", "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status", "ignition", "zezere-ignition", + "zram-generator", "zram-generator-defaults", "rsync", "attr", "ima-evm-utils", "openssl", "bash-completion",