From d9d9360619bc818f776cd4128a2faf64c14e699f Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Jul 26 2023 13:55:54 +0000
Subject: IoT: Update the package set and sort alphanetically


Some minor updates to the package set, we add the FDO client
and drop bluez/libgpiod, if they're needed it's easy to layer
them, and then we sort it all alphabetically.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>

---

diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index 56411d0..35c7bd1 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -73,60 +73,127 @@
     "check-groups": { "type": "file", "filename": "group" },
 
     "packages": ["fedora-release-iot",
-         "glibc", "glibc-minimal-langpack", "nss-altfiles",
-         "sssd-client", "libsss_sudo", "shadow-utils",
-         "dracut-config-generic", "dracut-network",
-         "rpm-ostree", "rpm", "polkit", "lvm2",
-         "cryptsetup", "pinentry",
-         "keyutils", "cracklib-dicts",
-         "e2fsprogs", "dosfstools",
-         "gnupg2", "authselect",
-         "basesystem", "python3", "bash",
-         "xz", "gzip",
-         "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",
-         "selinux-policy-targeted", "setup", "shadow-utils",
-         "sudo", "util-linux", "vim-minimal",
-         "systemd", "systemd-resolved",
-         "less", "tar",
-	 "fwupd", "fwupd-plugin-modem-manager",
-         "greenboot", "greenboot-default-health-checks",
-         "ignition", "zezere-ignition",
-         "zram-generator", "zram-generator-defaults",
-         "ima-evm-utils", "openssl",
-         "bash-completion",
-         "tmux", "screen",
-         "policycoreutils-python-utils",
-         "setools-console", "usbguard",
-         "chrony",
-         "bluez", "bluez-libs", "bluez-mesh",
-         "kernel-tools", "libgpiod-utils",
-         "podman", "podman-plugins", "container-selinux", "skopeo", "criu",
-         "containernetworking-plugins", "slirp4netns", "netavark", "aardvark-dns",
-         "parsec", "dbus-parsec",
-         "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2",
-         "efibootmgr", "fwupd-efi", "fwupd-plugin-uefi-capsule-data",
-         "kernel", "linux-firmware",
-         "iwlwifi-mvm-firmware", "iwlwifi-dvm-firmware",
-         "atheros-firmware", "brcmfmac-firmware", "realtek-firmware"],
-
-    "packages-aarch64": ["grub2-efi-aa64", "shim-aa64",
-         "uboot-images-armv8", "bcm283x-firmware", "arm-image-installer",
-         "optee_client"],
-
-    "packages-x86_64": ["grub2-efi-x64", "shim-x64", "microcode_ctl"],
+		"aardvark-dns",
+		"atheros-firmware",
+		"attr",
+		"authselect",
+		"basesystem",
+		"bash",
+		"bash-completion",
+		"brcmfmac-firmware",
+		"chrony",
+		"clevis",
+		"clevis-dracut",
+		"clevis-luks",
+		"clevis-pin-tpm2",
+		"container-selinux",
+		"containernetworking-plugins",
+		"coreutils",
+		"cracklib-dicts",
+		"criu",
+		"cryptsetup",
+		"curl",
+		"dbus-parsec",
+		"dnsmasq",
+		"dosfstools",
+		"dracut-config-generic",
+		"dracut-network",
+		"e2fsprogs",
+		"efibootmgr",
+		"fdo-client",
+		"firewalld",
+		"fwupd",
+		"fwupd-efi",
+		"fwupd-plugin-modem-manager",
+		"fwupd-plugin-uefi-capsule-data",
+		"glibc",
+		"glibc-minimal-langpack",
+		"gnupg2",
+		"greenboot",
+		"greenboot-default-health-checks",
+		"gzip",
+		"hostname",
+		"ignition",
+		"ima-evm-utils",
+		"iproute",
+		"iputils",
+		"iwd",
+		"iwlwifi-mvm-firmware",
+		"kernel-tools",
+		"keyutils",
+		"less",
+		"libsss_sudo",
+		"linux-firmware",
+		"lvm2",
+		"netavark",
+		"NetworkManager",
+		"NetworkManager-wifi",
+		"NetworkManager-wwan",
+		"nss-altfiles",
+		"openssl",
+		"openssh-clients",
+		"openssh-server",
+		"parsec",
+		"passwd",
+		"pinentry",
+		"podman",
+		"podman-plugins",
+		"policycoreutils",
+		"policycoreutils-python-utils",
+		"polkit",
+		"procps-ng",
+		"realtek-firmware",
+		"rootfiles",
+		"rpm",
+		"screen",
+		"selinux-policy-targeted",
+		"setools-console",
+		"setup",
+		"shadow-utils",
+		"skopeo",
+		"slirp4netns",
+		"sssd-client",
+		"sudo",
+		"systemd",
+		"systemd-resolved",
+		"tar",
+		"tmux",
+		"tpm2-pkcs11",
+		"traceroute",
+		"usbguard",
+		"util-linux",
+		"vim-minimal",
+		"wpa_supplicant",
+		"wireless-regdb",
+		"xfsprogs",
+		"xz",
+		"zezere-ignition",
+		"zram-generator"],
+
+    "packages-aarch64": ["arm-image-installer",
+		"bcm283x-firmware",
+		"grub2-efi-aa64",
+		"optee_client",
+		"shim-aa64",
+		"uboot-images-armv8"],
+
+    "packages-x86_64": ["grub2-efi-x64",
+		"microcode_ctl",
+		"shim-x64"],
 
     "default_target": "multi-user.target",
 
-    "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",
-              "parsec.service", "dbus-parsec.service"]
+    "units": ["NetworkManager.service",
+		"firewalld.service",
+		"sshd.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",
+		"parsec.service",
+		"dbus-parsec.service",
+		"zezere_ignition.timer",
+		"zezere_ignition_banner.service",]
 }