From 89891fb59e202615944a69b2406aab2c7d9d968e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 20 Aug 2021 09:06:40 +0100 Subject: [PATCH 01/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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 9d8263bb5e23381231a4c8d15667c51c15d77cf7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 9 Feb 2022 10:06:29 +0000 Subject: [PATCH 09/17] Setup for F-36 branched Signed-off-by: Peter Robinson --- config.ini | 6 +++--- fedora-iot-base.json | 2 +- fedora-iot-updates-stable.json | 2 +- fedora-iot-updates-testing.json | 2 +- fedora-iot.json | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config.ini b/config.ini index f0c2e20..8b0e7e9 100644 --- a/config.ini +++ b/config.ini @@ -10,9 +10,9 @@ os_pretty_name = Fedora IoT tree_name = docker-host tree_file = %(os_name)s-%(tree_name)s.json arch = x86_64 -release = f35 -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/ +release = f36 +ref = %(os_name)s/devel/%(arch)s/%(tree_name)s +yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/36/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 14aee2e..c377ef6 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -1,5 +1,5 @@ { - "ref": "fedora/stable/${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 aeb0024..1bacd21 100644 --- a/fedora-iot-updates-stable.json +++ b/fedora-iot-updates-stable.json @@ -1,5 +1,5 @@ - "ref": "fedora/stable/${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 5d008fe..d0b3866 100644 --- a/fedora-iot-updates-testing.json +++ b/fedora-iot-updates-testing.json @@ -1,5 +1,5 @@ { - "ref": "fedora/stable/${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 4ae8610..a247818 100644 --- a/fedora-iot.json +++ b/fedora-iot.json @@ -1,6 +1,6 @@ { - "ref": "fedora/stable/${basearch}/iot", + "ref": "fedora/devel/${basearch}/iot", "ex-jigdo-spec": "fedora-iot.spec", - "repos": ["fedora-35"], + "repos": ["fedora-36"], "include": "fedora-iot-base.json" } From fa1218befa60f6601fcdd06bd7a6733daba0e0c9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 9 Feb 2022 11:10:13 +0000 Subject: [PATCH 10/17] add authselect for Fedora feature, drop rng-tools 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 c377ef6..4061d33 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -79,7 +79,7 @@ "cryptsetup", "pinentry", "keyutils", "cracklib-dicts", "e2fsprogs", "xfsprogs", "dosfstools", - "gnupg2", + "gnupg2", "authselect", "basesystem", "python3", "bash", "xz", "gzip", "coreutils", "which", "curl", @@ -104,7 +104,7 @@ "tmux", "screen", "policycoreutils-python-utils", "setools-console", "usbguard", - "rng-tools", "chrony", + "chrony", "bluez", "bluez-libs", "bluez-mesh", "kernel-tools", "libgpiod-utils", "podman", "podman-plugins", "container-selinux", "skopeo", "criu", "slirp4netns", From d83508651b73ed69836cbe05f196fefd9a3d7b4c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 9 Feb 2022 13:45:55 +0000 Subject: [PATCH 11/17] Updates for F-36+ Signed-off-by: Peter Robinson --- fedora-iot-base.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 4061d33..e9ccac3 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -73,7 +73,7 @@ "packages": ["fedora-release-iot", "glibc", "glibc-minimal-langpack", "nss-altfiles", "sssd-client", "libsss_sudo", "shadow-utils", - "kernel", + "kernel", "linux-firmware", "dracut-config-generic", "dracut-network", "rpm-ostree", "polkit", "lvm2", "cryptsetup", "pinentry", @@ -107,7 +107,8 @@ "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", + "slirp4netns", " containernetworking-plugins", "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", "parsec", "dbus-parsec"], @@ -126,7 +127,7 @@ "default_target": "multi-user.target", - "units": ["NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service", + "units": ["NetworkManager.service", "firewalld.service", "sshd.service", "zezere_ignition.timer", "zezere_ignition_banner.service", "greenboot-grub2-set-counter.service", "greenboot-grub2-set-success.service", "greenboot-healthcheck.service", "greenboot-rpm-ostree-grub2-check-fallback.service", "greenboot-status.service", "greenboot-task-runner.service", From b9560a56f9f3e99766dd3b7ad2c9ed4a7c604883 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 23 Feb 2022 15:14:41 +0000 Subject: [PATCH 12/17] Further updates for F-36 Signed-off-by: Peter Robinson --- fedora-35.repo => fedora-36.repo | 10 +++++----- fedora-iot-base.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename fedora-35.repo => fedora-36.repo (61%) diff --git a/fedora-35.repo b/fedora-36.repo similarity index 61% rename from fedora-35.repo rename to fedora-36.repo index 901cd0a..51639ff 100644 --- a/fedora-35.repo +++ b/fedora-36.repo @@ -1,12 +1,12 @@ -[fedora-35] -name=Fedora 35 - $basearch +[fedora-36] +name=Fedora 36 - $basearch failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/35/Everything/$basearch/os/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-35&arch=$basearch +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/36/Everything/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-36&arch=$basearch enabled=1 #metadata_expire=7d repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-35-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-36-$basearch skip_if_unavailable=False diff --git a/fedora-iot-base.json b/fedora-iot-base.json index e9ccac3..4fd6c02 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -10,8 +10,8 @@ "documentation": false, - "automatic_version_prefix": "35", - "mutate-os-release": "35", + "automatic_version_prefix": "36", + "mutate-os-release": "36", "initramfs-args": ["--no-hostonly", "--add", "ignition watchdog"], From 512a6bcf7377ad712771059e513d99c206cedb17 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 18 Mar 2022 08:13:22 +0000 Subject: [PATCH 13/17] Add netavark for new podman 4 network 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 4fd6c02..b585dbb 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", - "slirp4netns", " containernetworking-plugins", + "containernetworking-plugins", "slirp4netns", "netavark", "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", "parsec", "dbus-parsec"], From 4187614f84298a3dd87e3002acb1e94f179ac8ee Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 20 Mar 2022 11:47:26 +0000 Subject: [PATCH 14/17] 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 b585dbb..5492e5d 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"], From dea4e33a338e133e2edd8368db8ac3da7cc52cb1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 26 Mar 2022 19:47:14 +0000 Subject: [PATCH 15/17] drop rsync Signed-off-by: Peter Robinson --- fedora-iot-base.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 5492e5d..9e5c785 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -75,21 +75,21 @@ "sssd-client", "libsss_sudo", "shadow-utils", "kernel", "linux-firmware", "dracut-config-generic", "dracut-network", - "rpm-ostree", "polkit", "lvm2", + "rpm-ostree", "rpm", "polkit", "lvm2", "cryptsetup", "pinentry", "keyutils", "cracklib-dicts", "e2fsprogs", "xfsprogs", "dosfstools", "gnupg2", "authselect", "basesystem", "python3", "bash", "xz", "gzip", - "coreutils", "which", "curl", + "coreutils", "which", "curl", "attr", "firewalld", "iptables", "NetworkManager", "NetworkManager-wifi", "NetworkManager-wwan", "wpa_supplicant", "wireless-regdb", "iwd", "tpm2-pkcs11", "dnsmasq", "traceroute", "hostname", "iproute", "iputils", "openssh-clients", "openssh-server", "passwd", - "policycoreutils", "procps-ng", "rootfiles", "rpm", + "policycoreutils", "procps-ng", "rootfiles", "selinux-policy-targeted", "setup", "shadow-utils", "sudo", "util-linux", "vim-minimal", "systemd", "systemd-resolved", @@ -98,7 +98,6 @@ "greenboot", "greenboot-default-health-checks", "ignition", "zezere-ignition", "zram-generator", "zram-generator-defaults", - "rsync", "attr", "ima-evm-utils", "openssl", "bash-completion", "tmux", "screen", From 9949efde99c9e0b3d235aaf5d2c875153695cc7d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 26 Mar 2022 19:52:35 +0000 Subject: [PATCH 16/17] Drop xfsprogs, it's not a default IoT filesystem 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 9e5c785..e0f8dc6 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -78,7 +78,7 @@ "rpm-ostree", "rpm", "polkit", "lvm2", "cryptsetup", "pinentry", "keyutils", "cracklib-dicts", - "e2fsprogs", "xfsprogs", "dosfstools", + "e2fsprogs", "dosfstools", "gnupg2", "authselect", "basesystem", "python3", "bash", "xz", "gzip", From c0b33c40ada4a608084f10c77f8cb6a07230194f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 6 May 2022 14:38:07 +0100 Subject: [PATCH 17/17] Move F-36 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 8b0e7e9..35fd99c 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 = f36 -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/36/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 e0f8dc6..4055655 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 a247818..2e90508 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-36"], "include": "fedora-iot-base.json"