Compare commits

...

10 Commits

Author SHA1 Message Date
David Abdurachmanov 8eab9e2971
Add support for riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2023-09-11 12:16:14 +03:00
Adam Williamson e209729554 Backport PR #4690 to avoid failing on empty files when reporting bugs 2023-04-11 10:45:35 -07:00
Packit 5032e468a5 [packit] 38.23.4 upstream release
Upstream tag: anaconda-38.23.4-1
Upstream commit: 55bc10f4

Signed-off-by: Packit <hello@packit.dev>
2023-03-28 17:43:51 +00:00
Packit 737f761756 [packit] 38.23.3 upstream release
Upstream tag: anaconda-38.23.3-1
Upstream commit: 190c3471

Signed-off-by: Packit <hello@packit.dev>
2023-03-24 12:26:25 +00:00
Packit 7e18cd11af [packit] 38.23.2 upstream release
Upstream tag: anaconda-38.23.2-1
Upstream commit: a9489642

Signed-off-by: Packit <hello@packit.dev>
2023-03-09 13:49:49 +00:00
Packit 9eac10c5eb [packit] 38.23.1 upstream release
Upstream tag: anaconda-38.23.1-1
Upstream commit: f2f88ba2

Signed-off-by: Packit <hello@packit.dev>
2023-02-16 16:50:38 +00:00
Packit d305fe7015 [packit] 38.21 upstream release
Upstream tag: anaconda-38.21-1
Upstream commit: 61e22ca1

Signed-off-by: Packit <hello@packit.dev>
2023-02-07 14:53:13 +00:00
Packit 61bee882c8 [packit] 38.20 upstream release
Upstream tag: anaconda-38.20-1
Upstream commit: 7fe58e6d

Signed-off-by: Packit <hello@packit.dev>
2023-02-07 05:05:40 +00:00
Adam Williamson 7a0d930f87 Drop another unapplied patch 2023-02-01 08:30:41 -08:00
Adam Williamson 36312aafff Drop two unapplied patches 2023-02-01 08:29:44 -08:00
10 changed files with 227 additions and 170 deletions

6
.gitignore vendored
View File

@ -341,3 +341,9 @@
/anaconda-38.17.tar.bz2
/anaconda-38.18.tar.bz2
/anaconda-38.19.tar.bz2
/anaconda-38.20.tar.bz2
/anaconda-38.21.tar.bz2
/anaconda-38.23.1.tar.bz2
/anaconda-38.23.2.tar.bz2
/anaconda-38.23.3.tar.bz2
/anaconda-38.23.4.tar.bz2

View File

@ -38,32 +38,24 @@ jobs:
- job: propose_downstream
trigger: release
dist_git_branches: main
dist_git_branches: f38
- job: tests
trigger: pull_request
targets:
- fedora-rawhide
- job: copr_build
trigger: pull_request
targets:
- fedora-rawhide
additional_repos:
# 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/"
- fedora-38
- job: copr_build
trigger: commit
targets:
- fedora-rawhide
branch: master
- fedora-38
branch: fedora-38
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/"
preserve_project: True

View File

@ -1,46 +0,0 @@
From 427f98963643e7f823f650dab015c80d854aa2d1 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 19 May 2022 09:50:17 -0700
Subject: [PATCH] Specify that we want the Adwaita icon theme
Back in 38556e7e in 2016 when anaconda switched from 'gnome'
icon theme, intending to use 'Adwaita' instead, we dropped the
line that specifically declares what theme anaconda wants to
use. Presumably we expected GTK would always pick Adwaita for
us. However, with GTK 3.24.34, this seems to not reliably happen
on KDE. On KDE images, the breeze icon theme is installed, and
it also provides many of the icons anaconda uses. When running
anaconda on a KDE live image with GTK 3.24.34, we're often seeing
the icons from the breeze theme used instead of the icons from
the Adwaita theme. This happened in 4 out of 4 tests on openQA
prod, 3 out of 4 tests on openQA stg, and 5 out of 5 tests I
ran in a VM myself. I then applied this change directly to the
file in the VM and re-tested another 5 times; all 5 times the
right icons were shown.
I'm not sure why this is suddenly a problem with GTK 3.24.34
when it never was before even though both icon themes have been
in KDE for years, but this seems correct anyway. We definitely
want anaconda to use the Adwaita icons, not ones from any other
theme.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
pyanaconda/ui/gui/__init__.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
index d458b66f14..428f30e744 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -754,6 +754,7 @@ class GraphicalUserInterface(UserInterface):
# Set some program-wide settings.
settings = Gtk.Settings.get_default()
settings.set_property("gtk-font-name", "Cantarell")
+ settings.set_property("gtk-icon-theme-name", "Adwaita")
# Get the path to the application data
data_path = os.environ.get("ANACONDA_DATA", "/usr/share/anaconda")
--
2.36.1

View File

@ -0,0 +1,35 @@
From 61155974a597e49bbc2b33ba2dc1e3b70162d99e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 11 Apr 2023 10:15:16 -0700
Subject: [PATCH] exception: only attach existent and non-empty files
(#2185827)
libreport barfs (in a non-fatal but scary way) if a file we try
to attach does not exist or is empty. Let's make sure all the
files exist and aren't empty before we try to attach them. In a
current F38+ live install, for instance, both packaging.log and
dnf.librepo.log are usually empty.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
pyanaconda/exception.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py
index d507cafcc2..3c39dff0f2 100644
--- a/pyanaconda/exception.py
+++ b/pyanaconda/exception.py
@@ -138,6 +138,10 @@ class AnacondaExceptionHandler(ExceptionHandler):
"""
log.debug("running handleException")
+ # don't try and attach empty or non-existent files (#2185827)
+ self.conf.fileList = [
+ fn for fn in self.conf.fileList if os.path.exists(fn) and os.path.getsize(fn) > 0
+ ]
exception_lines = traceback.format_exception(*dump_info.exc_info)
log.critical("\n".join(exception_lines))
--
2.40.0

View File

@ -1,48 +0,0 @@
From 216c1aa6684cbed2a7869d48f97bea95cb503ab6 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 8 Mar 2022 16:10:30 -0800
Subject: [PATCH] network: Handle network configuration paths not existing
When installing network configuration files, we shouldn't assume
that the relevant paths (network-scripts and system-connections)
actually exist, they don't have to. NetworkManager has split
/etc/sysconfig/network-scripts off into a subpackage that is
no longer installed by default. We guarded against this in
`get_config_files_paths` already, but not in
`_copy_device_config_files`.
---
pyanaconda/modules/network/installation.py | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/pyanaconda/modules/network/installation.py b/pyanaconda/modules/network/installation.py
index f46574e6f6..3ac65e0df0 100644
--- a/pyanaconda/modules/network/installation.py
+++ b/pyanaconda/modules/network/installation.py
@@ -240,15 +240,17 @@ Name={}
:param root: path to the root of the target system
:type root: str
"""
- for config_file in os.listdir(self.NETWORK_SCRIPTS_DIR_PATH):
- if config_file.startswith(self.NETWORK_SCRIPTS_CONFIG_FILE_PREFIXES):
- config_file_path = os.path.join(self.NETWORK_SCRIPTS_DIR_PATH,
+ if os.path.exists(self.NETWORK_SCRIPTS_DIR_PATH):
+ for config_file in os.listdir(self.NETWORK_SCRIPTS_DIR_PATH):
+ if config_file.startswith(self.NETWORK_SCRIPTS_CONFIG_FILE_PREFIXES):
+ config_file_path = os.path.join(self.NETWORK_SCRIPTS_DIR_PATH,
+ config_file)
+ self._copy_file_to_root(root, config_file_path)
+ if os.path.exists(self.NM_SYSTEM_CONNECTIONS_DIR_PATH):
+ for config_file in os.listdir(self.NM_SYSTEM_CONNECTIONS_DIR_PATH):
+ config_file_path = os.path.join(self.NM_SYSTEM_CONNECTIONS_DIR_PATH,
config_file)
self._copy_file_to_root(root, config_file_path)
- for config_file in os.listdir(self.NM_SYSTEM_CONNECTIONS_DIR_PATH):
- config_file_path = os.path.join(self.NM_SYSTEM_CONNECTIONS_DIR_PATH,
- config_file)
- self._copy_file_to_root(root, config_file_path)
def _copy_dhclient_config_files(self, root, network_ifaces):
"""Copy dhclient configuration files to target system.
--
2.35.1

View File

@ -1,54 +0,0 @@
From 67d146999a2356dd445cc4c6532e052596cae4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 21 Jun 2022 18:50:35 +0200
Subject: [PATCH 1/2] Don't attempt to add frozen python modules to initramfs
---
dracut/python-deps | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dracut/python-deps b/dracut/python-deps
index cc6138a5e44..587b44a46f9 100755
--- a/dracut/python-deps
+++ b/dracut/python-deps
@@ -70,6 +70,10 @@ except AttributeError:
while scripts:
script = scripts.pop()
+ if script == 'frozen':
+ # https://docs.python.org/3.11/whatsnew/3.11.html#frozen-imports-static-code-objects
+ continue
+
finder = ModuleFinder()
finder.run_script(script) # parse the script
for mod in finder.modules.values():
From da2f2499a6bfd2a0c1996c91457065d02040737f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 21 Jun 2022 19:01:21 +0200
Subject: [PATCH 2/2] Don't ignore errors from python-deps
---
dracut/module-setup.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh
index f54d7539621..019f0a1ef24 100755
--- a/dracut/module-setup.sh
+++ b/dracut/module-setup.sh
@@ -72,13 +72,14 @@ install() {
# timeout script for errors reporting
inst_hook initqueue/timeout 50 "$moddir/anaconda-error-reporting.sh"
# python deps for parse-kickstart. DOUBLE WOOOO
+ set -o pipefail
PYTHONHASHSEED=42 "$moddir/python-deps" "$moddir/parse-kickstart" "$moddir/driver_updates.py" | while read -r dep; do
case "$dep" in
*.so) inst_library "$dep" ;;
*.py) inst_simple "$dep" ;;
*) inst "$dep" ;;
esac
- done
+ done || exit 1
# support for specific architectures
case "$(uname -m)" in

View File

@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 0.65.2.post12+gc5a59a6.
The file was generated using packit 0.69.0.post27+g1374cc1.

89
anaconda-riscv64.patch Normal file
View File

@ -0,0 +1,89 @@
diff --git a/data/dbus/anaconda-bus.conf b/data/dbus/anaconda-bus.conf
index 75e0835..58de286 100644
--- a/data/dbus/anaconda-bus.conf
+++ b/data/dbus/anaconda-bus.conf
@@ -112,9 +112,9 @@
<limit name="max_message_size">1000000000</limit>
<!-- We do not override max_message_unix_fds here since the in-kernel
limit is also relatively low -->
- <limit name="service_start_timeout">600000</limit>
- <limit name="auth_timeout">240000</limit>
- <limit name="pending_fd_timeout">150000</limit>
+ <limit name="service_start_timeout">6000000</limit>
+ <limit name="auth_timeout">2400000</limit>
+ <limit name="pending_fd_timeout">1500000</limit>
<limit name="max_completed_connections">100000</limit>
<limit name="max_incomplete_connections">10000</limit>
<limit name="max_connections_per_user">100000</limit>
diff --git a/pyanaconda/modules/storage/bootloader/efi.py b/pyanaconda/modules/storage/bootloader/efi.py
index 1b47e24..507df96 100644
--- a/pyanaconda/modules/storage/bootloader/efi.py
+++ b/pyanaconda/modules/storage/bootloader/efi.py
@@ -28,7 +28,7 @@ from pyanaconda.product import productName
from pyanaconda.anaconda_loggers import get_module_logger
log = get_module_logger(__name__)
-__all__ = ["EFIBase", "EFIGRUB", "Aarch64EFIGRUB", "ArmEFIGRUB", "MacEFIGRUB"]
+__all__ = ["EFIBase", "EFIGRUB", "Aarch64EFIGRUB", "ArmEFIGRUB", "MacEFIGRUB", "RISCV64EFIGRUB"]
class EFIBase(object):
@@ -214,6 +214,15 @@ class ArmEFIGRUB(EFIGRUB):
self._is_32bit_firmware = True
+class RISCV64EFIGRUB(EFIGRUB):
+ _serial_consoles = ["ttyS"]
+ _efi_binary = "\\grubriscv64.efi"
+
+ def __init__(self):
+ super().__init__()
+ self._packages64 = ["grub2-efi-riscv64"]
+
+
class MacEFIGRUB(EFIGRUB):
def __init__(self):
super().__init__()
diff --git a/pyanaconda/modules/storage/bootloader/factory.py b/pyanaconda/modules/storage/bootloader/factory.py
index 8aa3afb..835ab2e 100644
--- a/pyanaconda/modules/storage/bootloader/factory.py
+++ b/pyanaconda/modules/storage/bootloader/factory.py
@@ -142,6 +142,10 @@ class BootLoaderFactory(object):
from pyanaconda.modules.storage.bootloader.extlinux import EXTLINUX
return EXTLINUX
+ if platform_class is platform.RISCV64EFI:
+ from pyanaconda.modules.storage.bootloader.efi import RISCV64EFIGRUB
+ return RISCV64EFIGRUB
+
if platform_class is platform.ArmEFI:
from pyanaconda.modules.storage.bootloader.efi import ArmEFIGRUB
return ArmEFIGRUB
diff --git a/pyanaconda/modules/storage/platform.py b/pyanaconda/modules/storage/platform.py
index d0aa7ca..d9ddcae 100644
--- a/pyanaconda/modules/storage/platform.py
+++ b/pyanaconda/modules/storage/platform.py
@@ -295,6 +295,14 @@ class ArmEFI(EFI):
return ["vfat", "ntfs"]
+class RISCV64EFI(EFI):
+
+ @property
+ def non_linux_format_types(self):
+ """Format types of devices with non-linux operating systems."""
+ return ["vfat", "ntfs"]
+
+
class PPC(Platform):
@property
@@ -484,6 +492,8 @@ def get_platform():
return MacEFI()
elif arch.is_aarch64():
return Aarch64EFI()
+ elif arch.is_riscv64():
+ return RISCV64EFI()
elif arch.is_arm():
return ArmEFI()
else:

View File

@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 38.19
Release: 1%{?dist}
Version: 38.23.4
Release: 2.0.riscv64%{?dist}
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@ -11,6 +11,12 @@ 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/4690
# https://bugzilla.redhat.com/show_bug.cgi?id=2185827
# Don't try and attach non-existent or empty files to bug reports
Patch0: 0001-exception-only-attach-existent-and-non-empty-files-2.patch
Patch9: anaconda-riscv64.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -39,13 +45,14 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers
%define libxklavierver 5.4
%define mehver 0.23-1
%define nmver 1.0
%define pykickstartver 3.43-1
%define pykickstartver 3.46-1
%define pypartedver 2.5-2
%define pythonblivetver 1:3.6.0-1
%define rpmver 4.15.0
%define simplelinever 1.9.0-1
%define subscriptionmanagerver 1.26
%define utillinuxver 2.15.1
%define rpmostreever 2023.2
BuildRequires: libtool
BuildRequires: gettext-devel >= %{gettextver}
@ -101,7 +108,6 @@ Requires: python3-pwquality
Requires: python3-systemd
Requires: python3-productmd
Requires: python3-dasbus >= %{dasbusver}
Requires: python3-packaging
Requires: flatpak-libs
%if %{defined rhel} && %{undefined centos}
Requires: subscription-manager >= %{subscriptionmanagerver}
@ -238,6 +244,11 @@ Requires: nm-connection-editor
Requires: librsvg2
Requires: gnome-kiosk
Requires: brltty
# dependencies for rpm-ostree payload module
Requires: rpm-ostree >= %{rpmostreever}
Requires: ostree
# used by ostree command for native containers
Requires: skopeo
%description install-img-deps
The anaconda-install-img-deps metapackage lists all boot.iso installation image dependencies.
@ -353,7 +364,7 @@ rm -rf \
%{buildroot}/%{_sbindir}/liveinst \
%{buildroot}/%{_datadir}/anaconda/gnome \
%{buildroot}/%{_datadir}/anaconda/gnome/fedora-welcome \
%{buildroot}/%{_datadir}/anaconda/gnome/fedora-welcome.desktop \
%{buildroot}/%{_datadir}/anaconda/gnome/org.fedoraproject.welcome-screen.desktop \
%{buildroot}/%{_datadir}/applications/liveinst.desktop
%endif
@ -464,6 +475,78 @@ rm -rf \
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Mon Sep 11 2023 David Abdurachmanov <davidlt@rivosinc.com> - 38.23.4-2.0.riscv64
- Add support for riscv64 EFI
* Tue Apr 11 2023 Adam Williamson <awilliam@redhat.com> - 38.23.4-2
- Backport PR #4690 to avoid failing on empty files when reporting bugs
* Tue Mar 28 2023 Packit <hello@packit.dev> - 38.23.4-1
- Add 'vga' to the list of preserved kernel arguments (#2176782) (awilliam)
- Move ostreecontainer deps to install-img-deps (jkonecny)
- Update translations from Weblate
* Fri Mar 24 2023 Packit <hello@packit.dev> - 38.23.3-1
- Fix virt-install cockpit run on fedora-X images (jkonecny)
- For user unit tests, provide valid login.defs (vslavik)
- Don't copy binaries in user unit tests (vslavik)
- Don't create empty login.defs (vslavik)
- Generate the ostreesetup kickstart command (vponcova)
- Implement needs_network for rpm_ostree_container (#2125655) (jkonecny)
- Move rpm-ostree deps from Lorax to Anaconda (#2125655) (jkonecny)
- Deduplicate test data creation func in rpm ostree (jkonecny)
- Add release note for ostreecontainer (#2125655) (jkonecny)
- Add new OSTree container source test (#2125655) (jkonecny)
- Enable RPM OSTree from container source in payload (#2125655) (jkonecny)
- Add RPM OSTree source from container (#2125655) (jkonecny)
- fedora-welcome: Default to light style (fmuellner)
- fedora-welcome: Swap buttons (fmuellner)
- fedora-welcome: Drop icons from buttons (fmuellner)
- fedora-welcome: Use libadwaita (fmuellner)
- fedora-welcome: Use actions instead of clicked callbacks (fmuellner)
- fedora-welcome: Port to GTK4 (fmuellner)
- fedora-welcome: Tweak button labels (fmuellner)
- fedora-welcome: Adjust wording of description (fmuellner)
- fedora-welcome: Rename .desktop file (fmuellner)
- fedora-welcome: Add back app icon (fmuellner)
- fedora-welcome: Replace grids with boxes (fmuellner)
- fedora-welcome: Remove secondary screen (fmuellner)
- fedora-welcome: Launch .desktop file instead of spawning command (fmuellner)
- fedora-welcome: Fix passing command line flags (fmuellner)
- fedora-welcome: Use standard Javascript modules (fmuellner)
- fedora-welcome: Split out application subclass (fmuellner)
- fedora-window: Use show_all() only internally (fmuellner)
- fedora-welcome: Stop using deprecated Lang module (fmuellner)
- fedora-welcome: Reindent WelcomeWindow class (fmuellner)
- fedora-welcome: Use consistent quotes (fmuellner)
- fedora-welcome: Use template strings (fmuellner)
- fedora-welcome: Use consistent braces (fmuellner)
- fedora-welcome: Remove unused imports (fmuellner)
- Add config for Fedora Designsuite (luya)
- Update translations from Weblate
* Thu Mar 09 2023 Packit <hello@packit.dev> - 38.23.2-1
- Retranslate welcome screen more simply (vslavik)
- Fix translations of the pre-release warning dialog (#2165762) (vponcova)
- Update translations from Weblate
* Thu Feb 16 2023 Packit <hello@packit.dev> - 38.23.1-1
- Apply templates for Fedora 38 (mkolman)
- Fix new pylint detections (vslavik)
- Update translations from Weblate
* Tue Feb 07 2023 Packit <hello@packit.dev> - 38.21-1
- Sort RPM versions via rpm.labelCompare() and not via
packaging.version.LegacyVersion() (miro)
- Update translations from Weblate
* Tue Feb 07 2023 Packit <hello@packit.dev> - 38.20-1
- Add Sericea - ostree based Sway variant (jkonecny)
- Fix the systemd generator for systemd 253 (#2165433) (awilliam)
- WebUI: Updated wizard footer buttons (ozobal)
- Remove the dmraid and nodmraid boot options (vtrefny)
- Update translations from Weblate
* Tue Jan 31 2023 Packit <hello@packit.dev> - 38.19-1
- Remove mocking of modules for sphinx docs builds (vslavik)
- docs: Update branching instructions (vslavik)

View File

@ -1 +1 @@
SHA512 (anaconda-38.19.tar.bz2) = c4712bdb122887d0a25f0223991411cfecbc229c371cfe13b0dec7ed43554d0ab4cb78af8464a4e3b29723e7c9324207c6be980e3f0d1a149bb26caddd5f6b0f
SHA512 (anaconda-38.23.4.tar.bz2) = 88fa6261f7dd12ccc0e469c5662912e5dbcc7f5a521884aa77f943e0a3ad403e2a6d2f6b661fd3a2de71c1a16ef6b3f09add72dd1d7420dc3badc322ab6a3206