public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Adam Williamson <awilliam@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/anaconda] rawhide: Backport PR #7103 to fix kickstart installs
Date: Tue, 09 Jun 2026 00:37:29 GMT	[thread overview]
Message-ID: <178096544933.1.15028237917718438370.rpms-anaconda-d741e571f848@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/anaconda
Branch : rawhide
Commit : d741e571f848637a4de763949f193a5a268a1192
Author : Adam Williamson <awilliam@redhat.com>
Date   : 2026-06-08T17:37:17-07:00
Stats  : +53/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/anaconda/c/d741e571f848637a4de763949f193a5a268a1192?branch=rawhide

Log:
Backport PR #7103 to fix kickstart installs

---
diff --git a/7103.patch b/7103.patch
new file mode 100644
index 0000000..18646c8
--- /dev/null
+++ b/7103.patch
@@ -0,0 +1,45 @@
+From 8aea1f5c08c0ca1b715f469f951e2b78d4866723 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Mon, 8 Jun 2026 15:42:55 -0700
+Subject: [PATCH] python-deps: add _math_integer if math is present
+
+In Python 3.15, the math module requires a _math_integer module,
+but ModuleFinder does not tell us this. We'll just have to
+special-case it.
+
+Resolves: rhbz#2486569
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ dracut/python-deps | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/dracut/python-deps b/dracut/python-deps
+index 587b44a46f9..fd74a34d5e2 100755
+--- a/dracut/python-deps
++++ b/dracut/python-deps
+@@ -27,7 +27,6 @@ from importlib.util import find_spec
+ from modulefinder import ModuleFinder
+ 
+ # stringprep is needed by the idna encoding, and idna is needed by requests.
+-# The encoding import is implicit so ModuleFinder doesn't find it right.
+ alsoNeeded = {find_spec('requests').origin: find_spec('stringprep').origin}
+ 
+ # A couple helper functions...
+@@ -91,6 +90,16 @@ while scripts:
+         if mod.__file__ in alsoNeeded and alsoNeeded[mod.__file__] not in deps:
+             scripts.append(alsoNeeded[mod.__file__])
+ 
++try:
++    # In Python 3.15+, math requires _math_integer but ModuleFinder does
++    # not report this:
++    # https://bugzilla.redhat.com/show_bug.cgi?id=2486569
++    if find_spec('math').origin in deps and not find_spec("_math_integer").origin in deps:
++        deps.append(find_spec("_math_integer").origin)
++except AttributeError:
++    # In older Pythons _math_integer does not exist, this is fine
++    pass
++
+ # Include some bits that the python install itself needs
+ print(sysconfig.get_makefile_filename())
+ print(sysconfig.get_config_h_filename())

diff --git a/anaconda.spec b/anaconda.spec
index 5b1fb87..1ed42cb 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 45.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 ExcludeArch: %{ix86}
 License: GPL-2.0-or-later
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -13,6 +13,10 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
 
+# https://github.com/rhinstaller/anaconda/pull/7103
+# fix python-deps to fix kickstart installs
+Patch: 7103.patch
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -520,6 +524,9 @@ rm -rf \
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Mon Jun 08 2026 Adam Williamson <awilliam@redhat.com> - 45.6-3
+- Backport PR #7103 to fix kickstart installs
+
 * Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 45.6-2
 - Rebuilt for Python 3.15
 

                 reply	other threads:[~2026-06-09  0:37 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178096544933.1.15028237917718438370.rpms-anaconda-d741e571f848@fedoraproject.org \
    --to=awilliam@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox