starlingx/integ
Code Issues Proposed changes

CentOS 8: Upgrade anaconda to version 29.19.1.13

Browse Source 
(1) Release Version Upgrade
(2) change grub2 require to grub2-tools

As grub2 does not create empty grub2 pkg with upgrading
to el8, but create empty grub2 pkg in el7
so we should change the grub2 to grub2-tools pkg

Currently auto apply all patches as below
%autosetup -p1
instead of applying patches commmand by command:
%patchxxxx -p1

Story: 2006729
Task: 37687
Change-Id: I62ae8134d4b492aeca093ad7e8992256dcc91c1c
Signed-off-by: Long Li <lilong-neu@neusoft.com>
This commit is contained in:
Long Li 2020-05-09 15:53:16 +08:00
parent 5f6e275021
commit c2110212fb
8 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/anaconda/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=1
TIS_PATCH_VER=0

4
base/anaconda/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -8,13 +8,13 @@ Subject: [PATCH] Update package versioning for TIS format
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index ef88921..b345630 100644
index 69a55d2..2848ba3 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -7,7 +7,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 29.19.0.40
Version: 29.19.1.13
-Release: 1%{?dist}
+Release: 1.el8%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2+ and MIT

2
base/anaconda/centos/meta_patches/0004-Upversion-rpm-devel-dependency.patch
View File

@ -13,7 +13,7 @@ index 0c22aa0..0153e82 100644
+++ b/SPECS/anaconda.spec
@@ -46,7 +46,7 @@ Source0: %{name}-%{version}.tar.bz2
%define nmver 1.0
%define pykickstartver 3.16.2-1
%define pykickstartver 3.16.6-1
%define pypartedver 2.5-2
-%define rpmver 4.10.0
+%define rpmver 4.14.0

31
base/anaconda/centos/meta_patches/0006-Add-support-for-https-and-IPv6-to-anaconda-preexec.patch
View File

@ -7,18 +7,17 @@ Include the source patch that adds support for https and IPv6.
Signed-off-by: Don Penney <don.penney@windriver.com>
---
SPECS/anaconda.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
SPECS/anaconda.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index c482f38..8fea2fa 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -24,11 +24,12 @@ Patch8: 9800-rpmostreepayload-Rework-remote-add-handling.patch
Patch9: yumpayload-dont-verify-disabled-repos.patch
Patch10: anaconda-centos-armhfp-extloader.patch
@@ -16,10 +16,12 @@ Patch100: centos-l10n.patch
Patch101: 0001-branding-syspurpose-doesn-t-make-sense-for-CentOS.patch
Patch102: 0002-add-centos-background-color.patch
-# WRS
+# StarlingX
Patch10001: 0001-TIS-Progress-and-error-handling.patch
Patch10002: 0002-revert-7.4-grub2-efi-handling.patch
@ -26,22 +25,8 @@ index c482f38..8fea2fa 100644
Patch10004: 0004-Cache-server-ip-in-etc-hosts.patch
+Patch10005: 0005-Add-support-for-IPv6-and-https-to-anaconda-preexec.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@@ -256,11 +257,12 @@ runtime on NFS/HTTP/FTP servers or local disks.
%patch10 -p1
%endif
-# WRS
+# StarlingX
%patch10001 -p1
%patch10002 -p1
%patch10003 -p1
%patch10004 -p1
+%patch10005 -p1
%build
%configure --disable-static \
# To generate Source0 do:
# git clone https://github.com/rhinstaller/anaconda
--
1.8.3.1
2.7.4

8
base/anaconda/centos/patches/0001-TIS-Progress-and-error-handling.patch
View File

@ -139,7 +139,7 @@ index 4a88620..ac7b1f7 100644
stdoutLog.info(_("Running pre-installation scripts"))
diff --git a/pyanaconda/payload/dnfpayload.py b/pyanaconda/payload/dnfpayload.py
index 267f91e..b2a048d 100644
index 54069f9..27e2cb5 100644
--- a/pyanaconda/payload/dnfpayload.py
+++ b/pyanaconda/payload/dnfpayload.py
@@ -62,6 +62,7 @@ import dnf.conf.substitutions
@ -166,7 +166,7 @@ index 267f91e..b2a048d 100644
self._req_groups = set()
self._req_packages = set()
@@ -718,6 +721,7 @@ class DNFPayload(payload.PackagePayload):
@@ -741,6 +744,7 @@ class DNFPayload(payload.PackagePayload):
def _payload_setup_error(self, exn):
log.error('Payload setup error: %r', exn)
@ -174,7 +174,7 @@ index 267f91e..b2a048d 100644
if errors.errorHandler.cb(exn) == errors.ERROR_RAISE:
# The progress bar polls kind of slowly, thus installation could
# still continue for a bit before the quit message is processed.
@@ -1048,6 +1052,7 @@ class DNFPayload(payload.PackagePayload):
@@ -1071,6 +1075,7 @@ class DNFPayload(payload.PackagePayload):
if token == 'install':
msg = _("Installing %s") % msg
progressQ.send_message(msg)
@ -182,7 +182,7 @@ index 267f91e..b2a048d 100644
elif token == 'configure':
msg = _("Configuring %s") % msg
progressQ.send_message(msg)
@@ -1059,6 +1064,7 @@ class DNFPayload(payload.PackagePayload):
@@ -1082,6 +1087,7 @@ class DNFPayload(payload.PackagePayload):
elif token == 'post':
msg = (N_("Performing post-installation setup tasks"))
progressQ.send_message(msg)

12
base/anaconda/centos/patches/0002-revert-7.4-grub2-efi-handling.patch
View File

@ -8,21 +8,21 @@ Subject: [PATCH] revert 7.4 grub2 efi handling
1 file changed, 3 insertions(+), 33 deletions(-)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index d2c772d..0d40711 100644
index 44c16d1..42a466f 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1457,9 +1457,7 @@ class GRUB2(GRUB):
@@ -1458,9 +1458,7 @@ class GRUB2(GRUB):
"""
name = "GRUB2"
- # grub2 is a virtual provides that's provided by grub2-pc, grub2-ppc64le,
- # and all of the primary grub components that aren't grub2-efi-${EFIARCH}
- packages = ["grub2", "grub2-tools"]
+ packages = ["grub2"]
+ packages = ["grub2-tools"]
_config_file = "grub.cfg"
_config_dir = "grub2"
_passwd_file = "user.cfg"
@@ -1888,8 +1886,7 @@ class EFIGRUB1(EFIBase, GRUB):
@@ -1890,8 +1888,7 @@ class EFIGRUB1(EFIBase, GRUB):
class EFIGRUB(EFIBase, GRUB2):
@ -32,7 +32,7 @@ index d2c772d..0d40711 100644
can_dual_boot = False
stage2_is_valid_stage1 = False
stage2_bootable = False
@@ -1899,38 +1896,13 @@ class EFIGRUB(EFIBase, GRUB2):
@@ -1901,38 +1898,13 @@ class EFIGRUB(EFIBase, GRUB2):
def __init__(self):
super().__init__()
self.efi_dir = 'BOOT'
@ -72,7 +72,7 @@ index d2c772d..0d40711 100644
class ArmEFIGRUB(EFIGRUB):
_serial_consoles = ["ttyAMA", "ttyS"]
@@ -1938,12 +1910,10 @@ class ArmEFIGRUB(EFIGRUB):
@@ -1940,12 +1912,10 @@ class ArmEFIGRUB(EFIGRUB):
def __init__(self):
super().__init__()

2
base/anaconda/centos/patches/0005-Add-support-for-IPv6-and-https-to-anaconda-preexec.patch
View File

@ -109,5 +109,5 @@ index d491173..22e6833 100644
fi
--
1.8.3.1
2.7.4

2
base/anaconda/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/anaconda-29.19.0.40-1.el8.src.rpm
mirror:Source/anaconda-29.19.1.13-1.el8.src.rpm