From efaeec10aa732e354544c0aca99f398ad7b536ba Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 14 Feb 2021 12:03:35 +0000 Subject: [PATCH 1/5] Setup for F-34 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 c437a00..06fb7c3 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 = f34 -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/34/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 db7f2e8..d2534bb 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 4f3cf35..24b9a40 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-34"], "include": "fedora-iot-base.json" From d53503f344fcf36186a27a524417ab46d1e1e7b4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 21 Apr 2021 12:57:36 +0100 Subject: [PATCH 2/5] initrd: include the watchdog module 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 d2534bb..99ebf60 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -14,7 +14,7 @@ "mutate-os-release": "34", "initramfs-args": ["--no-hostonly", - "--add", "ignition"], + "--add", "ignition watchdog"], "boot_location": "new", "install-langs-comment": "Keep this in sync with treecompose-post.sh", From 1ea7a13be2d082b926a116f8bc9a926e946754a9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 27 Apr 2021 12:53:23 +0100 Subject: [PATCH 3/5] move F-34 to stable ostree branch Signed-off-by: Peter Robinson --- config.ini | 4 ++-- fedora-34.repo | 2 +- fedora-iot-base.json | 2 +- fedora-iot-updates-stable.json | 2 +- fedora-iot-updates-testing.json | 2 +- fedora-iot.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config.ini b/config.ini index 06fb7c3..7a758a0 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 = f34 -ref = %(os_name)s/devel/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/34/Everything/%(arch)s/os/ +ref = %(os_name)s/stable/%(arch)s/%(tree_name)s +yum_baseurl = https://dl.fedoraproject.org/pub/fedora/linux/releases/34/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-34.repo b/fedora-34.repo index 64b8944..0e54ff7 100644 --- a/fedora-34.repo +++ b/fedora-34.repo @@ -5,7 +5,7 @@ failovermethod=priority metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-34&arch=$basearch enabled=1 #metadata_expire=7d -repo_gpgcheck=1 +repo_gpgcheck=0 type=rpm gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-$basearch diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 99ebf60..adf2202 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 24b9a40..9a2fc3e 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-34"], "include": "fedora-iot-base.json" From 9762bd68d186f26a2e2fd06d29fffae7269e6d1c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 3 May 2021 17:49:40 +0100 Subject: [PATCH 4/5] Add fwupd-plugin-modem-manager 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 adf2202..880f968 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -93,7 +93,7 @@ "selinux-policy-targeted", "setup", "shadow-utils", "sudo", "systemd", "util-linux", "vim-minimal", "less", "tar", - "fwupd", "usbguard", + "fwupd", "fwupd-plugin-modem-manager", "usbguard", "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status", "ignition", "zezere-ignition", "zram-generator", "zram-generator-defaults", From d1d8082e3bf7b9295e5ccd8ea97a41e55640d2fc Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 10 Oct 2021 13:29:48 +0100 Subject: [PATCH 5/5] 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 880f968..ec6b969 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -113,7 +113,7 @@ "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "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", "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",