starlingx/integ
Code Issues Proposed changes

Centos 8: Disable modular filtering

Browse Source 
Disable modular filtering for the repositories added
in kickstart during anaconda installation so that
non-modular and modular packages can be found and
installed.

Change-Id: I6f424f472a5ad0aa82709e8859b9793336487a2e
Story: 2006729
Task: 37687
Signed-off-by: Angie Wang <angie.wang@windriver.com>
This commit is contained in:
Angie Wang 2021-03-15 18:10:34 -05:00
parent bf4aaef02b
commit e39f85cbf6
3 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
base/anaconda/centos/meta_patches/0007-meta-Disable-modular-filtering.patch Normal file
View File

@ -0,0 +1,25 @@
From d419edc515eb89ffd4db885a04087e3c32d28fbd Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.wang@windriver.com>
Date: Thu, 4 Mar 2021 22:51:14 -0600
Subject: [PATCH 1/1] meta Disable modular filtering
Signed-off-by: Angie Wang <angie.wang@windriver.com>
---
SPECS/anaconda.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 85d6e12..f132b92 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -22,6 +22,7 @@ Patch10002: 0002-revert-7.4-grub2-efi-handling.patch
Patch10003: 0003-Set-default-hostname-to-localhost.patch
Patch10004: 0004-Cache-server-ip-in-etc-hosts.patch
Patch10005: 0005-Add-support-for-IPv6-and-https-to-anaconda-preexec.patch
+Patch10006: 0006-Disable-modular-filtering.patch
# To generate Source0 do:
# git clone https://github.com/rhinstaller/anaconda
--
1.8.3.1

1
base/anaconda/centos/meta_patches/PATCH_ORDER
View File

@ -4,3 +4,4 @@
0004-Upversion-rpm-devel-dependency.patch
0005-Add-TIS-patches-for-host-lookup.patch
0006-Add-support-for-https-and-IPv6-to-anaconda-preexec.patch
0007-meta-Disable-modular-filtering.patch

29
base/anaconda/centos/patches/0006-Disable-modular-filtering.patch Normal file
View File

@ -0,0 +1,29 @@
From fae21a368a03200088236bd0ca60fc25a8f439f2 Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.wang@windriver.com>
Date: Thu, 4 Mar 2021 22:45:49 -0600
Subject: [PATCH 1/1] Disable modular filtering
Disable modular filtering for the repositories added in kickstart
Signed-off-by: Angie Wang <angie.wang@windriver.com>
---
pyanaconda/payload/dnfpayload.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pyanaconda/payload/dnfpayload.py b/pyanaconda/payload/dnfpayload.py
index 27e2cb5..e810efd 100644
--- a/pyanaconda/payload/dnfpayload.py
+++ b/pyanaconda/payload/dnfpayload.py
@@ -373,6 +373,9 @@ class DNFPayload(payload.PackagePayload):
log.error("Failed to parse proxy for _add_repo %s: %s",
ksrepo.proxy, e)
+ # Disable filtering of modular packages
+ repo.module_hotfixes = True
+
if ksrepo.cost:
repo.cost = ksrepo.cost
--
1.8.3.1