From 89891fb59e202615944a69b2406aab2c7d9d968e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 20 Aug 2021 09:06:40 +0100 Subject: [PATCH 01/10] Setup for F-35 branched Signed-off-by: Peter Robinson --- config.ini | 4 ++-- fedora-iot-base.json | 2 +- fedora-iot-updates-testing.json | 2 +- fedora-iot.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.ini b/config.ini index c3def07..b7551e1 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 = f35 -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/35/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 c7675bc..0c1cb5a 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 1b7ca7a..1d85c97 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-35"], "include": "fedora-iot-base.json" From adce3705154cdaa165328b210276e929dc3e16c6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 28 Aug 2021 13:29:30 +0100 Subject: [PATCH 02/10] drop audit from package set audit for unknown and unexplained reasons keeps depending on the long legacy Sys-V initscripts/chkconfig and we don't want to pull in the legacy deps so drop audit. 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 0c1cb5a..6ceecda 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -104,7 +104,7 @@ "tmux", "screen", "policycoreutils-python-utils", "setools-console", "usbguard", - "audit", "rng-tools", "chrony", + "rng-tools", "chrony", "bluez", "bluez-libs", "bluez-mesh", "kernel-tools", "libgpiod-utils", "podman", "podman-plugins", "container-selinux", "skopeo", "criu", "slirp4netns", From 75a554eaf142bca01e19eb6d26818a1a7ac88291 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 10 Oct 2021 13:29:48 +0100 Subject: [PATCH 03/10] Add Intel Wireless AX2xx firmware Signed-off-by: Peter Robinson --- fedora-iot-base.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 6ceecda..85272e8 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -113,7 +113,7 @@ "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "fwupd-efi", "uboot-tools", "uboot-images-armv8", "bcm283x-firmware", - "arm-image-installer", "iwl7260-firmware"], + "arm-image-installer", "iwl7260-firmware", "iwlax2xx-firmware"], "packages-armhfp": ["grub2-efi-arm", "efibootmgr", "uboot-tools", "uboot-images-armv7", "bcm283x-firmware", @@ -122,7 +122,8 @@ "packages-x86_64": ["grub2", "grub2-efi-x64", "efibootmgr", "shim-x64", "fwupd-efi", "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"], + "iwl5150-firmware", "iwl6000-firmware", "iwl6050-firmware", "iwl7260-firmware", + "iwlax2xx-firmware"], "default_target": "multi-user.target", From 46df2ad574f1dde3de8545b7efe71335127704ca Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 31 Oct 2021 14:57:03 +0000 Subject: [PATCH 04/10] move F-35 to stable ostree branch Signed-off-by: Peter Robinson --- config.ini | 2 +- fedora-iot-base.json | 2 +- fedora-iot-updates-stable.json | 2 +- fedora-iot-updates-testing.json | 2 +- fedora-iot.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.ini b/config.ini index b7551e1..f0c2e20 100644 --- a/config.ini +++ b/config.ini @@ -11,7 +11,7 @@ tree_name = docker-host tree_file = %(os_name)s-%(tree_name)s.json arch = x86_64 release = f35 -ref = %(os_name)s/devel/%(arch)s/%(tree_name)s +ref = %(os_name)s/stable/%(arch)s/%(tree_name)s yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/35/Everything/%(arch)s/os/ # lorax_additional_repos = http://127.0.0.1/fedora-iot/local-overrides lorax_include_packages = fedora-productimg-iot diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 85272e8..8c33b9a 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 1d85c97..4ae8610 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-35"], "include": "fedora-iot-base.json" From 930c105c4c01b522f19e6823151e8fb4483c1e49 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 10 Nov 2021 14:35:42 +0000 Subject: [PATCH 05/10] Update greenboot packages for upstream changes 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 8c33b9a..3f72ac0 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -95,7 +95,7 @@ "systemd", "systemd-resolved", "less", "tar", "fwupd", "fwupd-plugin-modem-manager", - "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status", + "greenboot", "greenboot-default-health-checks", "ignition", "zezere-ignition", "zram-generator", "zram-generator-defaults", "rsync", "attr", From 3d103dd17c3d1df45b96fcd0358fa7e9f491e85c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 11 Dec 2021 16:55:04 +0000 Subject: [PATCH 06/10] Add fwupd-plugin-uefi-capsule-data 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 3f72ac0..0badb44 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -94,7 +94,7 @@ "sudo", "util-linux", "vim-minimal", "systemd", "systemd-resolved", "less", "tar", - "fwupd", "fwupd-plugin-modem-manager", + "fwupd", "fwupd-plugin-modem-manager", "fwupd-plugin-uefi-capsule-data", "greenboot", "greenboot-default-health-checks", "ignition", "zezere-ignition", "zram-generator", "zram-generator-defaults", From 5aef14d84dfa648b55d6b1ef12d4bde59342bc58 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 11 Dec 2021 17:40:07 +0000 Subject: [PATCH 07/10] Drop uboot-tools, now unnessary Signed-off-by: Peter Robinson --- fedora-iot-base.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 0badb44..1f8b8ab 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -112,11 +112,11 @@ "parsec", "dbus-parsec"], "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "fwupd-efi", - "uboot-tools", "uboot-images-armv8", "bcm283x-firmware", + "uboot-images-armv8", "bcm283x-firmware", "arm-image-installer", "iwl7260-firmware", "iwlax2xx-firmware"], "packages-armhfp": ["grub2-efi-arm", "efibootmgr", - "uboot-tools", "uboot-images-armv7", "bcm283x-firmware", + "uboot-images-armv7", "bcm283x-firmware", "arm-image-installer"], "packages-x86_64": ["grub2", "grub2-efi-x64", "efibootmgr", "shim-x64", "fwupd-efi", "microcode_ctl", From f40b28086f92ef97ffc1b5df86f3d1bb34131b46 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 12 Dec 2021 20:55:06 +0000 Subject: [PATCH 08/10] no fwupd-plugin-uefi-capsule-data on armhfp Signed-off-by: Peter Robinson --- fedora-iot-base.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 1f8b8ab..14aee2e 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -94,7 +94,7 @@ "sudo", "util-linux", "vim-minimal", "systemd", "systemd-resolved", "less", "tar", - "fwupd", "fwupd-plugin-modem-manager", "fwupd-plugin-uefi-capsule-data", + "fwupd", "fwupd-plugin-modem-manager", "greenboot", "greenboot-default-health-checks", "ignition", "zezere-ignition", "zram-generator", "zram-generator-defaults", @@ -112,18 +112,17 @@ "parsec", "dbus-parsec"], "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "fwupd-efi", - "uboot-images-armv8", "bcm283x-firmware", + "uboot-images-armv8", "bcm283x-firmware", "fwupd-plugin-uefi-capsule-data", "arm-image-installer", "iwl7260-firmware", "iwlax2xx-firmware"], - "packages-armhfp": ["grub2-efi-arm", "efibootmgr", - "uboot-images-armv7", "bcm283x-firmware", + "packages-armhfp": ["grub2-efi-arm", "efibootmgr", "uboot-images-armv7", "bcm283x-firmware", "arm-image-installer"], "packages-x86_64": ["grub2", "grub2-efi-x64", "efibootmgr", "shim-x64", "fwupd-efi", "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", - "iwlax2xx-firmware"], + "iwlax2xx-firmware", "fwupd-plugin-uefi-capsule-data"], "default_target": "multi-user.target", From 91cdd7f876096ac0e6541b88839f468475bdb9e6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 18 Mar 2022 08:14:26 +0000 Subject: [PATCH 09/10] Add netavark for new podman 4 network Signed-off-by: Peter Robinson --- fedora-iot-base.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 14aee2e..8e92646 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -107,7 +107,8 @@ "rng-tools", "chrony", "bluez", "bluez-libs", "bluez-mesh", "kernel-tools", "libgpiod-utils", - "podman", "podman-plugins", "container-selinux", "skopeo", "criu", "slirp4netns", + "podman", "podman-plugins", "container-selinux", "skopeo", "criu", + "containernetworking-plugins", "slirp4netns", "netavark", "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", "parsec", "dbus-parsec"], From a65a74bcb42c23dc3071aece10fcc91e7326ce4c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 20 Mar 2022 11:47:56 +0000 Subject: [PATCH 10/10] Add aardvark-dns for local container lookups 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 8e92646..9e2cae2 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -108,7 +108,7 @@ "bluez", "bluez-libs", "bluez-mesh", "kernel-tools", "libgpiod-utils", "podman", "podman-plugins", "container-selinux", "skopeo", "criu", - "containernetworking-plugins", "slirp4netns", "netavark", + "containernetworking-plugins", "slirp4netns", "netavark", "aardvark-dns", "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", "parsec", "dbus-parsec"],