starlingx/integ
Code Issues Proposed changes

rebase anaconda patch to CentOS 7.6 version

Browse Source 
Test:
Build pass with build pkgs and build iso, and then build rpms for installer,
update installer and rebuild iso again. And deploy multi-node test pass.

Depends-On: https://review.openstack.org/628835/

Story: 2004522
Task: 28413

Change-Id: Iaba803124b9795df206646f6bc24c2862795bbdd
Signed-off-by: Martin, Chen <haochuan.z.chen@intel.com>
This commit is contained in:
Martin, Chen 2019-01-07 11:01:18 +08:00
parent 0c58aee440
commit 683d3632bc
10 changed files with 44 additions and 46 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=5
TIS_PATCH_VER=6

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

@ -14,7 +14,7 @@ index e2d706d..00b19c4 100644
@@ -3,7 +3,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 21.48.22.121
Version: 21.48.22.147
-Release: 1%{?dist}
+Release: 1.el7.centos%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2+ and MIT

22
base/anaconda/centos/meta_patches/0002-Add-TIS-patches.patch
View File

@ -4,28 +4,26 @@ Date: Mon, 13 Nov 2017 17:22:49 -0500
Subject: [PATCH] Add TIS patches
---
SPECS/anaconda.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
SPECS/anaconda.spec | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 00b19c4..79e1c55 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -22,7 +22,10 @@ Patch6: anaconda-centos-help-text.patch
Patch7: anaconda-centos-skip-retry-if-not-connected.patch
Patch8: 9800-rpmostreepayload-Rework-remote-add-handling.patch
Patch1000: yumpayload-dont-verify-disabled-repos.patch
-
+
@@ -24,6 +24,9 @@ Patch8: 9800-rpmostreepayload-Rework-remote-add-handling.patch
Patch9: yumpayload-dont-verify-disabled-repos.patch
Patch10: anaconda-centos-armhfp-extloader.patch
+# WRS
+Patch10001: 0001-TIS-Progress-and-error-handling.patch
+
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
%define gettextver 0.18.1
@@ -243,6 +246,9 @@ runtime on NFS/HTTP/FTP servers or local disks.
%patch8 -p1
%patch1000 -p1
%define dbusver 1.2.3
@@ -250,6 +253,9 @@ runtime on NFS/HTTP/FTP servers or local disks.
%patch10 -p1
%endif
+# WRS
+%patch10001 -p1

4
base/anaconda/centos/meta_patches/0003-revert-7.4-grub2-efi-handling.patch
View File

@ -11,7 +11,7 @@ diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 79e1c55..2e5ece9 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -25,6 +25,7 @@ Patch1000: yumpayload-dont-verify-disabled-repos.patch
@@ -26,6 +26,7 @@ Patch10: anaconda-centos-armhfp-extloader.patch
# WRS
Patch10001: 0001-TIS-Progress-and-error-handling.patch
@ -19,7 +19,7 @@ index 79e1c55..2e5ece9 100644
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@@ -248,6 +249,7 @@ runtime on NFS/HTTP/FTP servers or local disks.
@@ -255,6 +256,7 @@ runtime on NFS/HTTP/FTP servers or local disks.
# WRS
%patch10001 -p1

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

@ -11,15 +11,15 @@ diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 2e5ece9..174dbee 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -48,7 +48,7 @@ Patch10002: 0002-revert-7.4-grub2-efi-handling.patch
%define isomd5sum 1.0.10
%define fcoeutilsver 1.0.12-3.20100323git
%define iscsiver 6.2.0.870-3
@@ -51,7 +51,7 @@ Patch10002: 0002-revert-7.4-grub2-efi-handling.patch
%define pypartedver 2.5-2
%define pythonpyblockver 0.45
%define pythonurlgrabberver 3.9.1-5
-%define rpmver 4.10.0
+%define rpmver 4.14.0
%define libarchivever 3.0.4
%define langtablever 0.0.31-3
%define libxklavierver 5.4
%define sckeyboardver 1.3.1
%define utillinuxver 2.15.1
%define yumutilsver 1.1.11-3
--
1.8.3.1

8
base/anaconda/centos/meta_patches/0005-Add-TIS-patches-for-host-lookup.patch
View File

@ -11,7 +11,7 @@ diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 174dbee..8541334 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -26,6 +26,8 @@ Patch1000: yumpayload-dont-verify-disabled-repos.patch
@@ -27,6 +27,8 @@ Patch10: anaconda-centos-armhfp-extloader.patch
# WRS
Patch10001: 0001-TIS-Progress-and-error-handling.patch
Patch10002: 0002-revert-7.4-grub2-efi-handling.patch
@ -20,7 +20,7 @@ index 174dbee..8541334 100644
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@@ -250,6 +252,8 @@ runtime on NFS/HTTP/FTP servers or local disks.
@@ -257,6 +259,8 @@ runtime on NFS/HTTP/FTP servers or local disks.
# WRS
%patch10001 -p1
%patch10002 -p1
@ -29,7 +29,7 @@ index 174dbee..8541334 100644
%build
%configure --disable-static \
@@ -268,6 +272,10 @@ desktop-file-install ---dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_
@@ -275,6 +279,10 @@ desktop-file-install ---dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_
mkdir -p %{buildroot}%{_datadir}/anaconda/site-python
install -m 0644 pyanaconda/sitecustomize.py %{buildroot}%{_datadir}/anaconda/site-python/
%endif
@ -40,7 +40,7 @@ index 174dbee..8541334 100644
# NOTE: If you see "error: Installed (but unpackaged) file(s) found" that include liveinst files,
# check the IS_LIVEINST_ARCH in configure.ac to make sure your architecture is properly defined
@@ -316,6 +324,7 @@ update-desktop-database &> /dev/null || :
@@ -323,6 +331,7 @@ update-desktop-database &> /dev/null || :
%{_sysconfdir}/X11/xinit/xinitrc.d/*
%{_datadir}/applications/*.desktop
%endif

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

@ -92,7 +92,7 @@ diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py
index 8a97f95..3d0d2da 100644
--- a/pyanaconda/flags.py
+++ b/pyanaconda/flags.py
@@ -70,6 +70,7 @@ class Flags(object):
@@ -71,6 +71,7 @@ class Flags(object):
self.ksprompt = True
self.rescue_mode = False
self.kexec = False
@ -126,16 +126,16 @@ diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 50515c8..d95b2df 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -81,6 +81,8 @@ from pykickstart.sections import NullSection, PackageSection, PostScriptSection,
from pykickstart.sections import Section
@@ -90,6 +90,8 @@ from pykickstart.sections import NullSection, PackageSection, PostScriptSection,
from pykickstart.version import returnClassForVersion, RHEL7
from pykickstart.options import KSOptionParser
+from pyanaconda.tisnotify import tisnotify
+
import logging
log = logging.getLogger("anaconda")
stderrLog = logging.getLogger("anaconda.stderr")
@@ -2342,6 +2344,7 @@ def runPreScripts(scripts):
@@ -2481,6 +2483,7 @@ def runPreScripts(scripts):
if len(preScripts) == 0:
return
@ -164,15 +164,15 @@ index 7cf59d7..8896ba1 100644
exn = PayloadInstallError("%s %s exited with code %d" % (cmd, argv, rc))
if errors.errorHandler.cb(exn) == errors.ERROR_RAISE:
raise exn
@@ -170,6 +173,7 @@ class RPMOSTreePayload(ArchivePayload):
try:
repo.pull(ostreesetup.remote, [ostreesetup.ref], 0, progress, cancellable)
@@ -183,6 +186,7 @@ class RPMOSTreePayload(ArchivePayload):
GLib.Variant('a{sv}', pull_opts),
progress, cancellable)
except GLib.GError as e:
+ tisnotify.failed()
exn = PayloadInstallError("Failed to pull from repository: %s" % e)
log.error(str(exn))
if errors.errorHandler.cb(exn) == errors.ERROR_RAISE:
@@ -213,6 +217,7 @@ class RPMOSTreePayload(ArchivePayload):
@@ -227,6 +231,7 @@ class RPMOSTreePayload(ArchivePayload):
try:
self._copyBootloaderData()
except (OSError, RuntimeError) as e:
@ -202,7 +202,7 @@ index c6aa234..a0497e0 100644
self.reset()
def reset(self, root=None, releasever=None):
@@ -1338,6 +1342,8 @@ reposdir=%s
@@ -1347,6 +1351,8 @@ reposdir=%s
if self.data.packages.handleMissing == KS_MISSING_IGNORE:
return
@ -211,7 +211,7 @@ index c6aa234..a0497e0 100644
# If we're doing non-interactive ks install, raise CmdlineError,
# otherwise the system will just reboot automatically
if flags.automatedInstall and not flags.ksprompt:
@@ -1515,6 +1521,7 @@ reposdir=%s
@@ -1524,6 +1530,7 @@ reposdir=%s
try:
self.checkSoftwareSelection()
except DependencyError as e:
@ -219,7 +219,7 @@ index c6aa234..a0497e0 100644
if errorHandler.cb(e) == ERROR_RAISE:
progressQ.send_quit(1)
while True:
@@ -1569,6 +1576,10 @@ reposdir=%s
@@ -1578,6 +1585,10 @@ reposdir=%s
key, text = line.split(":", 1)
msg = progress_map[key] + text
progressQ.send_message(msg)
@ -230,7 +230,7 @@ index c6aa234..a0497e0 100644
log.debug(msg)
elif line.startswith("DEBUG:"):
log.debug(line[6:])
@@ -1581,7 +1592,8 @@ reposdir=%s
@@ -1590,7 +1601,8 @@ reposdir=%s
install_errors.append(line[6:])
else:
log.debug(line)
@ -240,7 +240,7 @@ index c6aa234..a0497e0 100644
log.error("Error running anaconda-yum: %s", e)
exn = PayloadInstallError(str(e))
if errorHandler.cb(exn) == ERROR_RAISE:
@@ -1603,6 +1615,7 @@ reposdir=%s
@@ -1612,6 +1624,7 @@ reposdir=%s
shutil.rmtree(iutil.getSysroot()+"/var/tmp/yum.cache")
if install_errors:

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

@ -11,7 +11,7 @@ diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 9db9cf3..24e8b56 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1388,9 +1388,7 @@ class GRUB2(GRUB):
@@ -1404,9 +1404,7 @@ class GRUB2(GRUB):
"""
name = "GRUB2"
@ -22,7 +22,7 @@ index 9db9cf3..24e8b56 100644
_config_file = "grub.cfg"
_config_dir = "grub2"
_passwd_file = "user.cfg"
@@ -1664,28 +1662,12 @@ class GRUB2(GRUB):
@@ -1680,28 +1678,12 @@ class GRUB2(GRUB):
return ret
class EFIGRUB(GRUB2):
@ -53,7 +53,7 @@ index 9db9cf3..24e8b56 100644
@property
def _config_dir(self):
@@ -1695,15 +1677,6 @@ class EFIGRUB(GRUB2):
@@ -1711,15 +1693,6 @@ class EFIGRUB(GRUB2):
super(EFIGRUB, self).__init__()
self.efi_dir = 'BOOT'
@ -69,7 +69,7 @@ index 9db9cf3..24e8b56 100644
def efibootmgr(self, *args, **kwargs):
if flags.imageInstall or flags.dirInstall:
log.info("Skipping efibootmgr for image/directory install.")
@@ -1796,12 +1769,9 @@ class EFIGRUB(GRUB2):
@@ -1812,12 +1785,9 @@ class EFIGRUB(GRUB2):
return True
class Aarch64EFIGRUB(EFIGRUB):

2
base/anaconda/centos/patches/0003-Set-default-hostname-to-localhost.patch
View File

@ -11,7 +11,7 @@ diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index c6f7bb7..26c24a3 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -63,7 +63,7 @@ networkConfFile = "%s/network" % (sysconfigDir)
@@ -65,7 +65,7 @@ networkConfFile = "%s/network" % (sysconfigDir)
hostnameFile = "/etc/hostname"
ipv6ConfFile = "/etc/sysctl.d/anaconda.conf"
ifcfgLogFile = "/tmp/ifcfg.log"

2
base/anaconda/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/anaconda-21.48.22.121-1.el7.centos.src.rpm
mirror:Source/anaconda-21.48.22.147-1.el7.centos.src.rpm