From 0258c30528a94625fce8f9793b8fd5892fc1fc2d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 1 Apr 2019 02:37:44 +0100 Subject: [PATCH 01/13] 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 de35d47..1211c27 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -100,7 +100,7 @@ "greenboot", "greenboot-grub2", "greenboot-ostree-grub2", "greenboot-reboot", "initial-setup", "cloud-utils-growpart", - "rsync", "atomic-devmode", + "rsync", "bash-completion", "tmux", "screen", "policycoreutils-python-utils", From 9edab6615577bf08ac5a23a1a701e163739f841a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 2 Apr 2019 10:47:38 +0100 Subject: [PATCH 02/13] 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 1211c27..4d1c071 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 2bc5b7414609d01b53293a8d42024569242e80fc Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 6 Apr 2019 02:48:35 +0100 Subject: [PATCH 03/13] drop ostree-grub2 as it's now handled by BLS config in grub2 Signed-off-by: Peter Robinson --- fedora-iot-base.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 4d1c071..03fc0e1 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -112,15 +112,15 @@ "clevis", "clevis-dracut", "clevis-luks", "attr"], - "packages-aarch64": ["grub2-efi-aa64", "ostree-grub2", "efibootmgr", "shim-aa64", + "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "uboot-tools", "uboot-images-armv8", "bcm283x-firmware", "fwupdate", "fwupdate-efi", "arm-image-installer"], - "packages-armhfp": ["grub2-efi-arm", "ostree-grub2", "efibootmgr", + "packages-armhfp": ["grub2-efi-arm", "efibootmgr", "uboot-tools", "uboot-images-armv7", "bcm283x-firmware", "arm-image-installer"], - "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2", "efibootmgr", "shim-x64", + "packages-x86_64": ["grub2", "grub2-efi-x64", "efibootmgr", "shim-x64", "fwupdate", "fwupdate-efi", "microcode_ctl", "iwl1000-firmware", "iwl100-firmware", "iwl105-firmware", "iwl135-firmware", "iwl2000-firmware", "iwl2030-firmware", "iwl3160-firmware", "iwl5000-firmware", From a723d891b03e1ef83f94784caebdd589d0c2e8c2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 14 Apr 2019 12:53:17 +0100 Subject: [PATCH 04/13] update greenboot package names for changes in 0.7 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 03fc0e1..29bb5f2 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -97,7 +97,7 @@ "sudo", "systemd", "util-linux", "vim-minimal", "less", "tar", "fwupd", "usbguard", - "greenboot", "greenboot-grub2", "greenboot-ostree-grub2", "greenboot-reboot", + "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status", "initial-setup", "cloud-utils-growpart", "rsync", From b797daf959c94c84f1a330d504a167f533920d44 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 15 Apr 2019 13:07:39 +0100 Subject: [PATCH 05/13] 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 29bb5f2..39af223 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -114,7 +114,8 @@ "packages-aarch64": ["grub2-efi-aa64", "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", "efibootmgr", "uboot-tools", "uboot-images-armv7", "bcm283x-firmware", From c877ac6693bf54d07755a15dcec92470786fc153 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 15 Apr 2019 13:10:53 +0100 Subject: [PATCH 06/13] 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 39af223..09962c2 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 fd200588bc7cab74cceb1b103a383051c4816e5a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 15 Apr 2019 14:58:46 +0100 Subject: [PATCH 07/13] 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 09962c2..5b81511 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 3904d21c35d92ff45c38f75d29b16d6f96441e13 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 24 Apr 2019 14:14:18 +0100 Subject: [PATCH 08/13] 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 5b81511..e7e19a0 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 e1599db94c9b8cd6949640f17323a0809dd163ac Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 4 Jun 2019 11:27:27 +0100 Subject: [PATCH 09/13] 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 e7e19a0..ef276ce 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"], From de549d3dbb07908205c253193a79f4d7d331e744 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 25 Jun 2019 18:39:41 +0100 Subject: [PATCH 10/13] f30: move to composing on the stable release 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 3a0c11e..80b8836 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 = f30 -ref = %(os_name)s/devel/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/rawhide/%(arch)s/os/ +ref = %(os_name)s/stable/%(arch)s/%(tree_name)s +yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/releases/30/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 ef276ce..4f36899 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 c2fd98b..73cf756 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-30"], "include": "fedora-iot-base.json" From f538395fc3a403e548c97d42bf3b8a1b8c794466 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 10 Jul 2019 15:08:12 +0100 Subject: [PATCH 11/13] Revert "f30: move to composing on the stable release branch" Temporary This reverts commit de549d3dbb07908205c253193a79f4d7d331e744. --- 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 80b8836..3a0c11e 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 = f30 -ref = %(os_name)s/stable/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/releases/30/Everything/%(arch)s/os/ +ref = %(os_name)s/devel/%(arch)s/%(tree_name)s +yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/rawhide/%(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 4f36899..ef276ce 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 73cf756..c2fd98b 100644 --- a/fedora-iot.json +++ b/fedora-iot.json @@ -1,5 +1,5 @@ { - "ref": "fedora/stable/${basearch}/iot", + "ref": "fedora/devel/${basearch}/iot", "ex-jigdo-spec": "fedora-iot.spec", "repos": ["fedora-30"], "include": "fedora-iot-base.json" From 4df8b31e34cfb323c6322b78f3ef464bc7c79e6a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 10 Jul 2019 15:10:26 +0100 Subject: [PATCH 12/13] fix url --- config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.ini b/config.ini index 3a0c11e..e51ac7e 100644 --- a/config.ini +++ b/config.ini @@ -12,7 +12,7 @@ tree_file = %(os_name)s-%(tree_name)s.json arch = x86_64 release = f30 ref = %(os_name)s/devel/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/rawhide/%(arch)s/os/ +yum_baseurl = https://dl.fedoraproject.org/pub/fedora/linux/releases/30/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 From 2dea5c5c8420aef879d88282df99089e4a3f36fc Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 22 Jul 2019 15:48:12 +0100 Subject: [PATCH 13/13] move F-30 to stable ostree branch Signed-off-by: Peter Robinson --- config.ini | 2 +- fedora-iot-base.json | 2 +- fedora-iot-updates-stable.json | 4 ++-- 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 e51ac7e..c89c292 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 = f30 -ref = %(os_name)s/devel/%(arch)s/%(tree_name)s +ref = %(os_name)s/stable/%(arch)s/%(tree_name)s yum_baseurl = https://dl.fedoraproject.org/pub/fedora/linux/releases/30/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 ef276ce..4f36899 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..4cd2d57 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 c2fd98b..73cf756 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-30"], "include": "fedora-iot-base.json"