!26 Add a temporary hack to fix installations on ppc64le and aarch64

Merge pull request !26 from yanan-rock/LTS
This commit is contained in:
openeuler-ci-bot 2020-08-24 16:49:37 +08:00 committed by Gitee
commit bdc980894c
3 changed files with 68 additions and 4 deletions

View File

@ -0,0 +1,57 @@
From ff06b13c273bcabd538eec2095d480867166f0fd Mon Sep 17 00:00:00 2001
From: Martin Kolman <mkolman@redhat.com>
Date: Tue, 29 Oct 2019 14:00:46 +0100
Subject: [PATCH] Add a temporary hack to fix installations on ppc64le and
aarch64 (#1764666)
Quoting bug 1764666:
"Currently Rawhide isn't installable on aarch64 and ppc64le,
because we are hitting bug #1722181 again.
The reasons are increased size of TLS in current distro
(resp. in the libs the python interpreter loads for anaconda to run)
combined with internal limitations of TLS support on these platforms.
I talked to the toolchain people and they think it can be fixed,
but it will take some months before the fix is available.
You can read the details in the thread starting with
https://sourceware.org/ml/libc-alpha/2019-09/msg00512.html,
https://sourceware.org/bugzilla/show_bug.cgi?id=25051
is the current plan for a fix.
So to unblock Rawhide on aarch64 and ppc64le, I propose we carry a patch
in the Fedora anaconda rpms, that workarounds the problem. Although the
change is harmless, I don't think it belongs to upstream anaconda, thus
the request for a patch. I have tested the patch thru an updates image
on ppc64le and it makes anaconda run again."
Unfortunately due to how our release process works, it's easier to
temporarily have this patch in upstream rather than to carry it as
a downstream patch for Rawhide.
Resolves: rhbz#1764666
Related: rhbz#1722181
---
data/tmux.conf | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/data/tmux.conf b/data/tmux.conf
index c909aca31..be7c38e3e 100644
--- a/data/tmux.conf
+++ b/data/tmux.conf
@@ -18,7 +18,12 @@ set-option -g history-limit 10000
# The idea here is to detach the client started here via anaconda.service, and
# then re-attach to it in the tmux service run on the console tty.
-new-session -d -s anaconda -n main "anaconda"
+
+# FIXME: Temporary hot fix added to make Fedora installable on aarch64 and ppc64le.
+# For more infromation see:
+# rhbz#1764666
+# rhbz#1722181
+new-session -d -s anaconda -n main "LD_PRELOAD=libgomp.so.1 anaconda"
set-option status-right '#[fg=blue]#(echo -n "Switch tab: Alt+Tab | Help: F1 ")'
--
2.17.1

View File

@ -10,8 +10,8 @@ diff -uNrp a/data/tmux.conf b/data/tmux.conf
set-option -s exit-unattached off
set-option -g base-index 1
@@ -20,7 +19,7 @@ set-option -g history-limit 10000
# then re-attach to it in the tmux service run on the console tty.
new-session -d -s anaconda -n main "anaconda"
# rhbz#1722181
new-session -d -s anaconda -n main "LD_PRELOAD=libgomp.so.1 anaconda"
-set-option status-right '#[fg=blue]#(echo -n "Switch tab: Alt+Tab | Help: F1 ")'
+set-option status-right '#[fg=blue]#(echo -n "Switch tab: Alt+Tab ")'

View File

@ -3,7 +3,7 @@
Name: anaconda
Version: 29.24.7
Release: 31
Release: 32
Summary: Graphical system installer
License: GPLv2+ and MIT
URL: https://fedoraproject.org/wiki/Anaconda
@ -13,6 +13,8 @@ Patch6000: anaconda-change-log-localtime-to-gmtime.patch
Patch6001: bugfix-Increase-network-timeout-constant.patch
Patch6002: bugfix-Set-timeout-for-all-session.get-calls.patch
Patch6003: anaconda-not-acquire-the-lock-of-imp.patch
Patch6004: anaconda-Set-up-LD_PRELOAD-for-the-Payloads-module.patch
Patch6005: anaconda-add-a-temporary-hack-to-fix-installations-on-ppc64le.patch
Patch9000: bugfix-update-network-and-hostname-translation.patch
Patch9001: add-password-policy.patch
@ -50,7 +52,6 @@ Patch9032: anaconda-modify-default-timezone-and-zh_CN_po.patch
Patch9033: bugfix-modify-network-hostname-dot-illegal.patch
Patch9034: backport-Remove-initThreading-method-from-pyanaconda-threading.patch
Patch9035: huawei-add-boot-options-for-dummy.patch
Patch9036: anaconda-Set-up-LD_PRELOAD-for-the-Payloads-module.patch
BuildRequires: audit-libs-devel libtool gettext-devel >= 0.19.8 gtk3-devel >= 3.22.17
BuildRequires: gtk-doc gtk3-devel-docs >= 3.22.17 glib2-doc gobject-introspection-devel
@ -223,6 +224,12 @@ update-desktop-database &> /dev/null || :
%{_datadir}/gtk-doc
%changelog
* Mon Aug 24 2020 yanan <yanan@huawei.com> - 29.24.7-32
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:add a temporary hack to fix installations on ppc64le and aarch64
* Fri Aug 21 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 29.24.7-31
- Type:bugfix
- Id:NA