diff --git a/bootupd.yaml b/bootupd.yaml index 62ebb0d..e15c48a 100644 --- a/bootupd.yaml +++ b/bootupd.yaml @@ -1,5 +1,5 @@ # KEEP THIS IN SYNC WITH https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/bootupd.yaml -# See also: https://forge.fedoraproject.org/atomic-desktops/config/src/branch/main/bootupd.yaml +# See also: https://pagure.io/workstation-ostree-config/blob/main/f/bootupd.yaml # # Integration with https://github.com/coreos/bootupd packages: diff --git a/config.ini b/config.ini index a91c1c6..19b955f 100644 --- a/config.ini +++ b/config.ini @@ -10,9 +10,9 @@ os_pretty_name = Fedora IoT tree_name = docker-host tree_file = %(os_name)s-%(tree_name)s.json arch = x86_64 -release = f46 -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/ +release = f44 +ref = %(os_name)s/stable/%(arch)s/%(tree_name)s +yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/releases/44/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-46.repo b/fedora-44.repo similarity index 60% rename from fedora-46.repo rename to fedora-44.repo index 03af70c..99cde87 100644 --- a/fedora-46.repo +++ b/fedora-44.repo @@ -1,12 +1,12 @@ -[fedora-46] -name=Fedora 46 - $basearch +[fedora-44] +name=Fedora 44 - $basearch failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/46/Everything/$basearch/os/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-46&arch=$basearch +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/44/Everything/$basearch/os/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-44&arch=$basearch enabled=1 #metadata_expire=7d repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-46-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-$basearch skip_if_unavailable=False diff --git a/fedora-iot-base.yaml b/fedora-iot-base.yaml index 79160b5..b27c919 100644 --- a/fedora-iot-base.yaml +++ b/fedora-iot-base.yaml @@ -4,14 +4,14 @@ include: - composefs.yaml # Read only sysroot - sysroot-ro.yaml -ref: fedora/rawhide/${basearch}/iot +ref: fedora/stable/${basearch}/iot repos: [] selinux: true tmp-is-dir: true recommends: false documentation: false -automatic_version_prefix: '46' -mutate-os-release: '46' +automatic_version_prefix: '44' +mutate-os-release: '44' initramfs-args: - "--no-hostonly" - "--add" @@ -130,7 +130,6 @@ packages: - iwlwifi-mvm-firmware - kernel - keyutils -- kmscon - less - libsss_sudo - linux-firmware diff --git a/fedora-iot-updates-stable.yaml b/fedora-iot-updates-stable.yaml index 263bd4b..f8d1849 100644 --- a/fedora-iot-updates-stable.yaml +++ b/fedora-iot-updates-stable.yaml @@ -1,2 +1,2 @@ include: fedora-iot-base.yaml -ref: fedora/rawhide/${basearch}/updates/iot +ref: fedora/stable/${basearch}/updates/iot diff --git a/fedora-iot-updates-testing.yaml b/fedora-iot-updates-testing.yaml index c6eb5a5..11cb696 100644 --- a/fedora-iot-updates-testing.yaml +++ b/fedora-iot-updates-testing.yaml @@ -1,2 +1,2 @@ include: fedora-iot-base.yaml -ref: fedora/rawhide/${basearch}/testing/iot +ref: fedora/stable/${basearch}/testing/iot diff --git a/fedora-iot.yaml b/fedora-iot.yaml index b770dff..1df1c6d 100644 --- a/fedora-iot.yaml +++ b/fedora-iot.yaml @@ -1,5 +1,5 @@ include: fedora-iot-base.yaml -ref: fedora/rawhide/${basearch}/iot +ref: fedora/stable/${basearch}/iot repos: -- fedora-46 +- fedora-44 diff --git a/justfile b/justfile index 3eaf256..313ea6c 100644 --- a/justfile +++ b/justfile @@ -87,7 +87,7 @@ compose-legacy variant=default_variant: ${CMD} compose tree ${ARGS} \ --add-metadata-string="version=${variant_pretty} ${version}.${buildid}" \ - "${variant}.yaml" \ + "${variant}-ostree.yaml" \ |& tee "logs/${variant}_${version}_${buildid}.${timestamp}.log" if [[ ${EUID} -ne 0 ]]; then diff --git a/treecompose-post.sh b/treecompose-post.sh index e62b942..a47d8cf 100755 --- a/treecompose-post.sh +++ b/treecompose-post.sh @@ -18,7 +18,7 @@ done # Remove loader directory causing issues in Anaconda in unified core mode # Will be obsolete once we start using bootupd -# See - https://forge.fedoraproject.org/atomic-desktops/config/pulls/344 +# See - https://pagure.io/workstation-ostree-config/pull-request/344 rm -rf /usr/lib/ostree-boot/loader # Undo RPM scripts enabling units; we want the presets to be canonical