From ae7a16a922238432e8004f6b32e0d88ca03979b0 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 15 Feb 2024 17:07:02 +0000 Subject: [PATCH 1/4] [packit] 40.22.1 upstream release Upstream tag: anaconda-40.22.1-1 Upstream commit: 93a7e391 --- .gitignore | 1 + .packit.yml | 22 ++++++++++------------ README.packit | 2 +- anaconda.spec | 14 ++++++-------- sources | 2 +- 5 files changed, 19 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index e324ce0..ba7af5b 100644 --- a/.gitignore +++ b/.gitignore @@ -396,3 +396,4 @@ /anaconda-40.18.tar.bz2 /anaconda-40.20.tar.bz2 /anaconda-40.21.tar.bz2 +/anaconda-40.22.1.tar.bz2 diff --git a/.packit.yml b/.packit.yml index 8527817..b284e24 100644 --- a/.packit.yml +++ b/.packit.yml @@ -38,26 +38,24 @@ jobs: - job: propose_downstream trigger: release - dist_git_branches: main + dist_git_branches: f40 - job: tests trigger: pull_request targets: - - fedora-rawhide - - - job: copr_build - trigger: pull_request - targets: - - fedora-rawhide - - fedora-eln + - fedora-40 - job: copr_build trigger: commit targets: - - fedora-rawhide - - fedora-eln - branch: master + - fedora-40 + branch: fedora-40 owner: "@rhinstaller" - project: Anaconda + project: Anaconda-devel preserve_project: True + additional_repos: + - "copr://@storage/blivet-daily" + # This repository contains fixup of Rawhide broken environment. + # Mainly useful when there is a package which is not yet in Rawhide but build is available. + - "https://fedorapeople.org/groups/anaconda/repos/anaconda_fixup_repo/" diff --git a/README.packit b/README.packit index 29cc7d8..f592284 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.90.0.post1.dev9+g1f0325d1. +The file was generated using packit 0.91.0.post1.dev4+ge6fd4a25. diff --git a/anaconda.spec b/anaconda.spec index 6f60f46..53e317a 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda -Version: 40.21 -Release: 2%{?dist} +Version: 40.22.1 +Release: 1%{?dist} License: GPL-2.0-or-later URL: http://fedoraproject.org/wiki/Anaconda @@ -12,11 +12,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.bz2 -# https://github.com/rhinstaller/anaconda/pull/5460 -# https://bugzilla.redhat.com/show_bug.cgi?id=2262892 -# Fix ostree installs to btrfs with util-linux 2.40+ -Patch: 0001-Resolve-symlinks-in-ostree-install-bind-mount-destin.patch - # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -45,7 +40,7 @@ Patch: 0001-Resolve-symlinks-in-ostree-install-bind-mount-destin.patch %define nmver 1.0 %define pykickstartver 3.52-1 %define pypartedver 2.5-2 -%define pythonblivetver 1:3.8.2-2 +%define pythonblivetver 1:3.9.0-1 %define rpmver 4.15.0 %define simplelinever 1.9.0-1 %define subscriptionmanagerver 1.26 @@ -470,6 +465,9 @@ rm -rf \ %{_prefix}/libexec/anaconda/dd_* %changelog +* Thu Feb 15 2024 Packit - 40.22.1-1 +- Set up the fedora-40 branch (mkolman) + * Tue Feb 06 2024 Adam Williamson - 40.21-2 - Backport PR #5460 to fix ostree btrfs installs with new util-linux (#2262892) diff --git a/sources b/sources index c2128df..58e409a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-40.21.tar.bz2) = dccb68285b4fc233edffda6242541879971f32b76a4e53d3a4253675c7541fe6d2a7eb59ad28bd627133c16347a8e641a9004ac4081051a23d618d796b025cf0 +SHA512 (anaconda-40.22.1.tar.bz2) = 455260d804436bd41e08b0d9d07b3c25d7dd962682b7c25cd5a152dcf9c87c8612607d811c7180902797b4a36a3340fc9d65ea9b21ad1c13a04c40d9cbf80198 From 276d84c053fbc7e110b173098b64c4a0292b28df Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 20 Feb 2024 17:13:13 +0000 Subject: [PATCH 2/4] [packit] 40.22.2 upstream release Upstream tag: anaconda-40.22.2-1 Upstream commit: 38dceceb --- .gitignore | 1 + README.packit | 2 +- anaconda.spec | 6 +++++- sources | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ba7af5b..2077a8f 100644 --- a/.gitignore +++ b/.gitignore @@ -397,3 +397,4 @@ /anaconda-40.20.tar.bz2 /anaconda-40.21.tar.bz2 /anaconda-40.22.1.tar.bz2 +/anaconda-40.22.2.tar.bz2 diff --git a/README.packit b/README.packit index f592284..7553f6b 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.91.0.post1.dev4+ge6fd4a25. +The file was generated using packit 0.92.0. diff --git a/anaconda.spec b/anaconda.spec index 53e317a..93cec82 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 40.22.1 +Version: 40.22.2 Release: 1%{?dist} License: GPL-2.0-or-later URL: http://fedoraproject.org/wiki/Anaconda @@ -465,6 +465,10 @@ rm -rf \ %{_prefix}/libexec/anaconda/dd_* %changelog +* Tue Feb 20 2024 Packit - 40.22.2-1 +- Test for task category and category API (akankovs) +- Creating categories dbus API for installation phases (akankovs) + * Thu Feb 15 2024 Packit - 40.22.1-1 - Set up the fedora-40 branch (mkolman) diff --git a/sources b/sources index 58e409a..6967b83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-40.22.1.tar.bz2) = 455260d804436bd41e08b0d9d07b3c25d7dd962682b7c25cd5a152dcf9c87c8612607d811c7180902797b4a36a3340fc9d65ea9b21ad1c13a04c40d9cbf80198 +SHA512 (anaconda-40.22.2.tar.bz2) = f15ff2b2945db5c564919ffce1fb7156de54b6c3f62dd90d982c0907bc5decedd67013c7e69040a5768648dc77ed4e51372ebee99770ca12267e48c312b627d5 From 5cf970178a1e28e95638484abc27ee47b1e188a8 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 7 Mar 2024 14:52:14 -0800 Subject: [PATCH 3/4] Backport PR #5508 to make bootupd create EFI boot manager entries (#2268505) --- ...-call-bootupctl-with-update-firmware.patch | 31 +++++++++++++++++++ anaconda.spec | 9 +++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0001-bootupd-call-bootupctl-with-update-firmware.patch diff --git a/0001-bootupd-call-bootupctl-with-update-firmware.patch b/0001-bootupd-call-bootupctl-with-update-firmware.patch new file mode 100644 index 0000000..d88b34f --- /dev/null +++ b/0001-bootupd-call-bootupctl-with-update-firmware.patch @@ -0,0 +1,31 @@ +From d1424ea9ffa5d51d1cfa004b0861e345c4300902 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 6 Mar 2024 17:26:45 -0800 +Subject: [PATCH] bootupd: call bootupctl with --update-firmware + +This is required to write an entry to the EFI boot manager, +which we ought to do (anaconda does it when installing the +bootloader itself). Without this, boot of the installed system +will only work if it's configured to try and boot from the +hard disk using the fallback path. + +Signed-off-by: Adam Williamson +--- + .../modules/payloads/payload/rpm_ostree/installation.py | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py b/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py +index 0ac8583b78..f5ea666cf2 100644 +--- a/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py ++++ b/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py +@@ -520,6 +520,7 @@ class ConfigureBootloader(Task): + "install", + "--auto", + "--write-uuid", ++ "--update-firmware", + "--device", + dev_data.path, + "/", +-- +2.44.0 + diff --git a/anaconda.spec b/anaconda.spec index 93cec82..94ab9b7 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 40.22.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: http://fedoraproject.org/wiki/Anaconda @@ -11,6 +11,10 @@ URL: http://fedoraproject.org/wiki/Anaconda # ./autogen.sh # make dist Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.bz2 +# https://github.com/rhinstaller/anaconda/pull/5508 +# https://bugzilla.redhat.com/show_bug.cgi?id=2268505 +# Fix bootupd UEFI path to create an EFI boot manager entry +Patch: 0001-bootupd-call-bootupctl-with-update-firmware.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -465,6 +469,9 @@ rm -rf \ %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Mar 06 2024 Adam Williamson - 40.22.2-2 +- Backport PR #5508 to make bootupd create EFI boot manager entries (#2268505) + * Tue Feb 20 2024 Packit - 40.22.2-1 - Test for task category and category API (akankovs) - Creating categories dbus API for installation phases (akankovs) From 557c211864b8cf9118f03d0a38e6759e4ff2e7c5 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 25 Mar 2024 16:36:01 +0000 Subject: [PATCH 4/4] [packit] 40.22.3 upstream release Upstream tag: anaconda-40.22.3-1 Upstream commit: 5af1a67d --- .gitignore | 1 + README.packit | 2 +- anaconda.spec | 16 ++++++++++++++-- sources | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2077a8f..58e35a4 100644 --- a/.gitignore +++ b/.gitignore @@ -398,3 +398,4 @@ /anaconda-40.21.tar.bz2 /anaconda-40.22.1.tar.bz2 /anaconda-40.22.2.tar.bz2 +/anaconda-40.22.3.tar.bz2 diff --git a/README.packit b/README.packit index 7553f6b..d401b46 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.92.0. +The file was generated using packit 0.94.0.post1.dev8+g4b1f9717. diff --git a/anaconda.spec b/anaconda.spec index 94ab9b7..4bf47e4 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda -Version: 40.22.2 -Release: 2%{?dist} +Version: 40.22.3 +Release: 1%{?dist} License: GPL-2.0-or-later URL: http://fedoraproject.org/wiki/Anaconda @@ -126,7 +126,9 @@ Requires: NetworkManager-team Requires: kbd Requires: chrony Requires: systemd +%if ! 0%{?rhel} Requires: systemd-resolved +%endif Requires: python3-pid # Required by the systemd service anaconda-fips. @@ -469,6 +471,16 @@ rm -rf \ %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Mar 25 2024 Packit - 40.22.3-1 +- Disable preexec for vtActivate() (mkolman) +- Lower permissions for kickstart logs in /tmp (jkonecny) +- Copy /etc/resolv.conf to system only if there is no systemd-resolved + (rvykydal) +- Revert "Do not copy /etc/resolv.conf to chroot before installation" + (rvykydal) +- Do not use systemd-resolved in installer environment on RHEL (rvykydal) +- Do not write LVM devices file during image installation (vtrefny) + * Wed Mar 06 2024 Adam Williamson - 40.22.2-2 - Backport PR #5508 to make bootupd create EFI boot manager entries (#2268505) diff --git a/sources b/sources index 6967b83..94298f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-40.22.2.tar.bz2) = f15ff2b2945db5c564919ffce1fb7156de54b6c3f62dd90d982c0907bc5decedd67013c7e69040a5768648dc77ed4e51372ebee99770ca12267e48c312b627d5 +SHA512 (anaconda-40.22.3.tar.bz2) = 5fbd32df4f9ce43d62ba239f63908772c906053733d26600e9debfad4de8591b0400b7a261b087b856d90a604f674fe0f7a7a170722a2edbd9b252fa4f75622d