From e86ca679ede2ad69119fe8efc4f910f7b9a903ce Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 10 Feb 2023 11:19:08 -0500 Subject: [PATCH 1/5] Setup for F-38 branched Signed-off-by: Paul Whalen --- config.ini | 4 ++-- fedora-37.repo => fedora-38.repo | 0 fedora-iot-base.json | 2 +- fedora-iot-updates-stable.json | 2 +- fedora-iot-updates-testing.json | 2 +- fedora-iot.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename fedora-37.repo => fedora-38.repo (100%) diff --git a/config.ini b/config.ini index cc2f879..ebc6088 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 = f38 -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/38/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-37.repo b/fedora-38.repo similarity index 100% rename from fedora-37.repo rename to fedora-38.repo diff --git a/fedora-iot-base.json b/fedora-iot-base.json index eaedd75..c637797 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-stable.json b/fedora-iot-updates-stable.json index a3fb5ed..1bacd21 100644 --- a/fedora-iot-updates-stable.json +++ b/fedora-iot-updates-stable.json @@ -1,5 +1,5 @@ - "ref": "fedora/rawhide/${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 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 31c9ec4..dc406a9 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-38"], "include": "fedora-iot-base.json" From c9fa2864d47a0247af69914804c29c28804f4cba Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 17 Apr 2023 11:23:58 -0400 Subject: [PATCH 2/5] Move F-38 to stable ostree branch Signed-off-by: Paul Whalen --- 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 ebc6088..1c73c02 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 = f38 -ref = %(os_name)s/devel/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/38/Everything/%(arch)s/os/ +ref = %(os_name)s/stable/%(arch)s/%(tree_name)s +yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/releases/38/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 c637797..e281f6c 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 dc406a9..ba9a2ab 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-38"], "include": "fedora-iot-base.json" From f1dae780e76da819c5f7e1461d2bf9ff7b8eb8b8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 20 Apr 2023 14:51:16 +0100 Subject: [PATCH 3/5] Add split out wifi firmwares explicitly 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 e281f6c..1b48dd7 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -114,6 +114,7 @@ "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", "efibootmgr", "fwupd-efi", "fwupd-plugin-uefi-capsule-data", "iwl7260-firmware", "iwlax2xx-firmware"], + "atheros-firmware", "brcmfmac-firmware", "realtek-firmware"], "packages-aarch64": ["grub2-efi-aa64", "shim-aa64", "uboot-images-armv8", "bcm283x-firmware", "arm-image-installer"], From 927701bc6a2bc2c6e215e1a061d98ff12c6e594a Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 21 Apr 2023 14:08:41 -0400 Subject: [PATCH 4/5] Fix json formatting Signed-off-by: Paul Whalen --- 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 1b48dd7..0a8a2b7 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -113,7 +113,7 @@ "parsec", "dbus-parsec", "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", "efibootmgr", "fwupd-efi", "fwupd-plugin-uefi-capsule-data", - "iwl7260-firmware", "iwlax2xx-firmware"], + "iwl7260-firmware", "iwlax2xx-firmware", "atheros-firmware", "brcmfmac-firmware", "realtek-firmware"], "packages-aarch64": ["grub2-efi-aa64", "shim-aa64", From a04f0a27d72a5e9b192f1c0fc8c1a1484009e89e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 6 Jul 2023 11:10:10 +0100 Subject: [PATCH 5/5] firmware: Updates for changes in iwlwifi packaging The Intel WiFi firmware was consolidated/adjusted to better align with the kernel drivers. Signed-off-by: Peter Robinson --- fedora-iot-base.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 0a8a2b7..9e483a6 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -75,7 +75,6 @@ "packages": ["fedora-release-iot", "glibc", "glibc-minimal-langpack", "nss-altfiles", "sssd-client", "libsss_sudo", "shadow-utils", - "kernel", "linux-firmware", "dracut-config-generic", "dracut-network", "rpm-ostree", "rpm", "polkit", "lvm2", "cryptsetup", "pinentry", @@ -113,16 +112,14 @@ "parsec", "dbus-parsec", "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2", "efibootmgr", "fwupd-efi", "fwupd-plugin-uefi-capsule-data", - "iwl7260-firmware", "iwlax2xx-firmware", + "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"], - "packages-x86_64": ["grub2-efi-x64", "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"], + "packages-x86_64": ["grub2-efi-x64", "shim-x64", "microcode_ctl"], "default_target": "multi-user.target",