From b21aee29c9505dbdc84c56d7aa861d148f725503 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 23 Aug 2018 11:07:06 +0100 Subject: [PATCH 01/20] Update for F-29 branched composes Signed-off-by: Peter Robinson --- config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.ini b/config.ini index bcf221a..030d0cb 100644 --- a/config.ini +++ b/config.ini @@ -12,7 +12,7 @@ tree_file = %(os_name)s-%(tree_name)s.json arch = x86_64 release = f29 ref = %(os_name)s/%(release)s/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/rawhide/%(arch)s/os/ +yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/29/%(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 From 8b41cf5a01b458448f743cd072ad548fe26151da Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 23 Aug 2018 11:37:01 +0100 Subject: [PATCH 02/20] fix armhfp package list quoting 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 e75f6f3..5d0aeeb 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -115,7 +115,7 @@ "fwupdate", "fwupdate-efi", "arm-image-installer"], "packages-armhfp": ["grub2-efi-arm", "ostree-grub2", "efibootmgr", "atomic-devmode", - "uboot-tools", "uboot-images-armv7", "bcm283x-firmware"], + "uboot-tools", "uboot-images-armv7", "bcm283x-firmware", "arm-image-installer"], "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2", From 5266380b803963df9eb0a04576213007d838e235 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 26 Aug 2018 09:21:27 +0100 Subject: [PATCH 03/20] Include fedora-release-iot 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 5d0aeeb..feb4bca 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -68,7 +68,7 @@ "check-groups": { "type": "file", "filename": "group" }, "packages": ["atomic", - "fedora-release", + "fedora-release-iot", "glibc", "nss-altfiles", "shadow-utils", "sssd-client", "libsss_sudo", "dracut-config-generic", "kernel", From ab4b9da319ff3f006f3de21469b233fe300538c0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 30 Aug 2018 00:38:41 +0100 Subject: [PATCH 04/20] drop atomic package Signed-off-by: Peter Robinson --- fedora-iot-base.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index feb4bca..57371c0 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -67,8 +67,7 @@ "check-passwd": { "type": "file", "filename": "passwd" }, "check-groups": { "type": "file", "filename": "group" }, - "packages": ["atomic", - "fedora-release-iot", + "packages": ["fedora-release-iot", "glibc", "nss-altfiles", "shadow-utils", "sssd-client", "libsss_sudo", "dracut-config-generic", "kernel", From 0e034235a679809ac0827064db2acbce82587c67 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 12 Sep 2018 11:18:42 +0100 Subject: [PATCH 05/20] Enable recommends false to disable weak dependencies 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 57371c0..e839cfd 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -6,6 +6,8 @@ "selinux": true, + "recommends": false, + "documentation": false, "automatic_version_prefix": "29", From 0ac4f440c9f59a924081cc20b79611cee4e8f548 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 12 Sep 2018 12:43:01 +0100 Subject: [PATCH 06/20] explicitly add pinentry 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 e839cfd..9af1aad 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -76,7 +76,7 @@ "dracut-network", "rpm-ostree", "lvm2", "chrony", "zram", - "cryptsetup", + "cryptsetup", "pinentry", "authconfig", "e2fsprogs", "gnupg2", From 2bcb112078e9d30de5187b25cf6a4afbf495a74b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 6 Oct 2018 13:40:59 +0100 Subject: [PATCH 07/20] adjust services enabled in the installer 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 9af1aad..3d2621f 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -125,5 +125,5 @@ "default_target": "multi-user.target", - "units": ["initial-setup.service"] + "units": ["NetworkManager.service", "sshd.service", "rngd.service", "zram-swap.service"] } From 1954626ffb14b5dbc4d2507355398e82ce88e73d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 11 Oct 2018 10:17:46 +0100 Subject: [PATCH 08/20] add criu for container checkpoint/restore 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 3d2621f..49cf4b4 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -107,7 +107,7 @@ "audit", "rng-tools", "bluez", "bluez-libs", "wpan-tools", "kernel-tools", "libgpiod-utils", - "podman", + "podman", "criu", "attr"], "packages-aarch64": ["grub2-efi-aa64", "ostree-grub2", From 7f132aa9e339d3cdf96eed2f0538a869919484fa Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 27 Oct 2018 12:13:18 +0100 Subject: [PATCH 09/20] Add clevis for TPM2 support 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 49cf4b4..2858e3c 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -108,6 +108,7 @@ "bluez", "bluez-libs", "wpan-tools", "kernel-tools", "libgpiod-utils", "podman", "criu", + "clevis", "clevis-dracut", "clevis-luks", "attr"], "packages-aarch64": ["grub2-efi-aa64", "ostree-grub2", From 49c86596bc625ed444d6ec7d553410ad4dadaa2a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 12 Nov 2018 07:43:31 +0000 Subject: [PATCH 10/20] add intel iwl wireless firmwares Signed-off-by: Peter Robinson --- fedora-iot-base.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 2858e3c..f34edd1 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -99,7 +99,7 @@ "tar", "initial-setup", "cloud-utils-growpart", - "rsync", + "rsync", "atomic-devmode", "bash-completion", "tmux", "screen", "policycoreutils-python-utils", @@ -111,18 +111,19 @@ "clevis", "clevis-dracut", "clevis-luks", "attr"], - "packages-aarch64": ["grub2-efi-aa64", "ostree-grub2", - "efibootmgr", "shim-aa64", "atomic-devmode", + "packages-aarch64": ["grub2-efi-aa64", "ostree-grub2", "efibootmgr", "shim-aa64", "uboot-tools", "uboot-images-armv8", "bcm283x-firmware", "fwupdate", "fwupdate-efi", "arm-image-installer"], - "packages-armhfp": ["grub2-efi-arm", "ostree-grub2", "efibootmgr", "atomic-devmode", + "packages-armhfp": ["grub2-efi-arm", "ostree-grub2", "efibootmgr", "uboot-tools", "uboot-images-armv7", "bcm283x-firmware", "arm-image-installer"], - "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2", - "efibootmgr", "shim-x64", "atomic-devmode", - "fwupdate", "fwupdate-efi", "microcode_ctl"], + "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2", "efibootmgr", "shim-x64", + "fwupdate", "fwupdate-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"], "default_target": "multi-user.target", From f8100a67ec4a0908d8ab2ab95e64aadd7c641192 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 13 Nov 2018 13:14:04 +0000 Subject: [PATCH 11/20] add support for WWAN for 3G/LTE support 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 f34edd1..5bb718b 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -88,7 +88,7 @@ "which", "curl", "iptables-services", "iptables", "firewalld", - "NetworkManager", "NetworkManager-wifi", + "NetworkManager", "NetworkManager-wifi", "NetworkManager-wwan", "dnsmasq", "traceroute", "hostname", "iproute", "iputils", "openssh-clients", "openssh-server", "passwd", From 45728256f3655b89da91c54525f410ad93324a95 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 28 Nov 2018 12:06:15 +0000 Subject: [PATCH 12/20] update ostree branches for stable naming 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 030d0cb..f3d1fe8 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 = f29 -ref = %(os_name)s/%(release)s/%(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/29/%(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 5bb718b..42e5321 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -1,5 +1,5 @@ { - "ref": "fedora/29/${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 c954c21..aeb0024 100644 --- a/fedora-iot-updates-stable.json +++ b/fedora-iot-updates-stable.json @@ -1,5 +1,5 @@ - "ref": "fedora/29/${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 6e49a20..5d008fe 100644 --- a/fedora-iot-updates-testing.json +++ b/fedora-iot-updates-testing.json @@ -1,5 +1,5 @@ { - "ref": "fedora/29/${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 2ce09e3..63d3e32 100644 --- a/fedora-iot.json +++ b/fedora-iot.json @@ -1,5 +1,5 @@ { - "ref": "fedora/29/${basearch}/iot", + "ref": "fedora/stable/${basearch}/iot", "ex-jigdo-spec": "fedora-iot.spec", "repos": ["fedora-29"], "include": "fedora-iot-base.json" From f5bd68d6ea04b2754a0151b20d61c9c1bdeaf7f0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 25 Jan 2019 01:06:29 +0000 Subject: [PATCH 13/20] add usbguard to image 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 42e5321..6a2f926 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -84,6 +84,7 @@ "python3", "bash", "xz", "gzip", + "usbguard", "coreutils", "which", "curl", From da5398798008afd809349e379c84448a97932e1d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 1 Apr 2019 02:37:44 +0100 Subject: [PATCH 14/20] don't ship atomic-devmode 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 6a2f926..3bcffee 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -100,7 +100,7 @@ "tar", "initial-setup", "cloud-utils-growpart", - "rsync", "atomic-devmode", + "rsync", "bash-completion", "tmux", "screen", "policycoreutils-python-utils", From 93d69de780f73822101486d13009bde194ab73f4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 2 Apr 2019 10:47:38 +0100 Subject: [PATCH 15/20] add keyutils to image 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 3bcffee..1232727 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -77,7 +77,7 @@ "rpm-ostree", "lvm2", "chrony", "zram", "cryptsetup", "pinentry", - "authconfig", + "authconfig", "keyutils", "e2fsprogs", "gnupg2", "basesystem", From 3a8b3a34d7d77e00871db9d63d6cd39e9567d92e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 15 Apr 2019 13:07:39 +0100 Subject: [PATCH 16/20] add iwl7260-firmware for new intel WiFi firmware on Jetson Nano and similar 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 1232727..8e2a86d 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -114,7 +114,8 @@ "packages-aarch64": ["grub2-efi-aa64", "ostree-grub2", "efibootmgr", "shim-aa64", "uboot-tools", "uboot-images-armv8", "bcm283x-firmware", - "fwupdate", "fwupdate-efi", "arm-image-installer"], + "fwupdate", "fwupdate-efi", "arm-image-installer", + "iwl7260-firmware"], "packages-armhfp": ["grub2-efi-arm", "ostree-grub2", "efibootmgr", "uboot-tools", "uboot-images-armv7", "bcm283x-firmware", From 99e7691eb4fd81dd05ff96c39f13fcb45a5db539 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 15 Apr 2019 13:10:53 +0100 Subject: [PATCH 17/20] add firewalld.service to defaults 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 8e2a86d..34759ce 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -129,5 +129,5 @@ "default_target": "multi-user.target", - "units": ["NetworkManager.service", "sshd.service", "rngd.service", "zram-swap.service"] + "units": ["NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service", "zram-swap.service"] } From 8dbd5023c66f516e4c7ad4fb72e51ba7525dc524 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 15 Apr 2019 14:58:46 +0100 Subject: [PATCH 18/20] add polkit, it's needed by rpm-ostree, was previously pulled in by atomic package 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 34759ce..6ee17a7 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -74,7 +74,7 @@ "sssd-client", "libsss_sudo", "dracut-config-generic", "kernel", "dracut-network", - "rpm-ostree", "lvm2", + "rpm-ostree", "polkit", "lvm2", "chrony", "zram", "cryptsetup", "pinentry", "authconfig", "keyutils", From e8554656476c8234971c0d2aa963a9324084fd5d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 24 Apr 2019 14:14:18 +0100 Subject: [PATCH 19/20] explicitly add skopeo and container-selinux 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 6ee17a7..25be71e 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -108,7 +108,7 @@ "audit", "rng-tools", "bluez", "bluez-libs", "wpan-tools", "kernel-tools", "libgpiod-utils", - "podman", "criu", + "podman", "container-selinux", "skopeo", "criu", "clevis", "clevis-dracut", "clevis-luks", "attr"], From 0360696406028d0060c64b9033f5e07d559f32f7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 4 Jun 2019 11:27:27 +0100 Subject: [PATCH 20/20] add slirp4netns for non root container networks 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 25be71e..b4f5325 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -109,6 +109,7 @@ "bluez", "bluez-libs", "wpan-tools", "kernel-tools", "libgpiod-utils", "podman", "container-selinux", "skopeo", "criu", + "slirp4netns", "clevis", "clevis-dracut", "clevis-luks", "attr"],