packages/anaconda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!39 merge branch openEuler-20.09 to master

Browse Source 
From: @t_feng
Reviewed-by: @orange-snn
Signed-off-by: @orange-snn
This commit is contained in:
openeuler-ci-bot 2020-09-11 14:09:57 +08:00 committed by Gitee
commit 9d966e75ac
3 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
add-boot-args-for-smmu-and-video.patch Normal file
View File

@ -0,0 +1,31 @@
From 99970253a5600555118a64046259b7ef638655df Mon Sep 17 00:00:00 2001
From: t_feng <fengtao40@huawei.com>
Date: Fri, 11 Sep 2020 11:26:41 +0800
Subject: [PATCH] add boot args for smmu and video
---
pyanaconda/modules/storage/bootloader/grub2.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pyanaconda/modules/storage/bootloader/grub2.py b/pyanaconda/modules/storage/bootloader/grub2.py
index 17e46e5..a70ba7a 100644
--- a/pyanaconda/modules/storage/bootloader/grub2.py
+++ b/pyanaconda/modules/storage/bootloader/grub2.py
@@ -271,6 +271,14 @@ class GRUB2(BootLoader):
if blivet.arch.is_aarch64():
log.info("check boot args:%s", arg_str)
arg_str += " crashkernel=1024M,high"
+ if "smmu.bypassdev=0x1000:0x17" not in arg_str:
+ arg_str += " smmu.bypassdev=0x1000:0x17"
+ if "smmu.bypassdev=0x1000:0x15" not in arg_str:
+ arg_str += " smmu.bypassdev=0x1000:0x15"
+ if "video=efifb:off" not in arg_str:
+ arg_str += " video=efifb:off"
+ if "video=VGA-1:640x480-32@60me" not in arg_str:
+ arg_str += " video=VGA-1:640x480-32@60me"
else:
arg_str += " crashkernel=512M"
--
2.23.0

25
add-boot-options-for-smmu-and-crashkernel.patch
View File

@ -1,25 +0,0 @@
From c5a47d3285678f9d9ebbbab3d18946d858513732 Mon Sep 17 00:00:00 2001
From: t_feng <fengtao40@huawei.com>
Date: Fri, 19 Jun 2020 11:04:30 +0800
Subject: [PATCH] add boot options for smmu and crashkernel
---
data/anaconda.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/anaconda.conf b/data/anaconda.conf
index 89731f4..e75354d 100644
--- a/data/anaconda.conf
+++ b/data/anaconda.conf
@@ -124,7 +124,7 @@ preserved_arguments =
speakup_synth apic noapic apm ide noht acpi video
pci nodmraid nompath nomodeset noiswmd fips selinux
biosdevname ipv6.disable net.ifnames net.ifnames.prefix
- nosmt
+ nosmt smmu.bypassdev crashkernel
[Storage]
--
2.23.0

22
anaconda.spec
View File

@ -1,7 +1,7 @@
%define _empty_manifest_terminate_build 0 %define _empty_manifest_terminate_build 0
Name: anaconda Name: anaconda
Version: 33.19 Version: 33.19
Release: 7 Release: 8
Summary: Graphical system installer Summary: Graphical system installer
License: GPLv2+ and MIT License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda URL: http://fedoraproject.org/wiki/Anaconda
@ -20,13 +20,13 @@ Patch9006: hide-help-button.patch
Patch9007: modify-interface-is-extended-in-Chinese-mode.patch Patch9007: modify-interface-is-extended-in-Chinese-mode.patch
Patch9008: remove-vender-issue-in-netdev.patch Patch9008: remove-vender-issue-in-netdev.patch
Patch9009: modify-arguments-parsing.patch Patch9009: modify-arguments-parsing.patch
Patch9010: add-boot-options-for-smmu-and-crashkernel.patch
Patch9011: disable-product-name-in-welcome-is-uppercase.patch Patch9011: disable-product-name-in-welcome-is-uppercase.patch
Patch9012: modify-default-timezone.patch Patch9012: modify-default-timezone.patch
Patch9013: modify-network-hostname-dot-illegal.patch Patch9013: modify-network-hostname-dot-illegal.patch
Patch9014: disable-ssh-login-checkbox.patch Patch9014: disable-ssh-login-checkbox.patch
Patch9015: bugfix-add-kdump-parameter-into-kernel-cmdline.patch Patch9015: bugfix-add-kdump-parameter-into-kernel-cmdline.patch
Patch9016: bugfix-fix-password-policy.patch Patch9016: bugfix-fix-password-policy.patch
Patch9017: add-boot-args-for-smmu-and-video.patch
Patch6001: anaconda-Fix-stage2-as-default-sources.patch Patch6001: anaconda-Fix-stage2-as-default-sources.patch
Patch6002: anaconda-Allow-to-detect-devices-with-the-iso9660-file-system.patch Patch6002: anaconda-Allow-to-detect-devices-with-the-iso9660-file-system.patch
@ -243,6 +243,12 @@ update-desktop-database &> /dev/null || :
%{_datadir}/gtk-doc %{_datadir}/gtk-doc
%changelog %changelog
* Fri Sep 11 2020 fengtao <fengtao40@huawei.com> - 33.19-8
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add boot args for smmu and video
* Thu Sep 10 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 33.19-7 * Thu Sep 10 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 33.19-7
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA
@ -285,37 +291,37 @@ update-desktop-database &> /dev/null || :
* Mon Mar 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-28 * Mon Mar 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-28
- Type:bugfix - Type:bugfix
- Id:NA - ID:NA
- SUG:NA - SUG:NA
- DESC:add boot options for dummy - DESC:add boot options for dummy
* Wed Feb 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-27 * Wed Feb 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-27
- Type:bugfix - Type:bugfix
- Id:NA - ID:NA
- SUG:NA - SUG:NA
- DESC:Remove initThreading method from pyanaconda.threading - DESC:Remove initThreading method from pyanaconda.threading
* Thu Feb 06 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-26 * Thu Feb 06 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-26
- Type:bugfix - Type:bugfix
- Id:NA - ID:NA
- SUG:NA - SUG:NA
- DESC:modify network hostname dot error - DESC:modify network hostname dot error
* Thu Jan 16 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-25 * Thu Jan 16 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-25
- Type:bugfix - Type:bugfix
- Id:NA - ID:NA
- SUG:NA - SUG:NA
- DESC:modify default timezone and zh_CN.po - DESC:modify default timezone and zh_CN.po
* Thu Jan 16 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-24 * Thu Jan 16 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-24
- Type:bugfix - Type:bugfix
- Id:NA - ID:NA
- SUG:NA - SUG:NA
- DESC:fix setup fail in decode - DESC:fix setup fail in decode
* Thu Jan 16 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-23 * Thu Jan 16 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-23
- Type:enhancement - Type:enhancement
- Id:NA - ID:NA
- SUG:NA - SUG:NA
- DESC:modify openeuler in welcome to lowercase - DESC:modify openeuler in welcome to lowercase