database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support om installation on kylin OS

Browse Source
This commit is contained in:
chenxiaobin
2020-09-04 14:44:26 +08:00
parent 1827f95771
commit ac042d5939
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/manager/om/script/gspylib/common/CheckPythonVersion.py
View File

@ -29,7 +29,7 @@ def checkPythonVersion():
" is not correct: %s." %
distName + " should use Python 3.7.*")
else:
if not pythonVersion == (3, 6):
if not pythonVersion >= (3, 6):
raise Exception("[GAUSS-52200] : version of python"
" is not correct: %s." %
distName + " should use Python 3.6.*")

12
src/manager/om/script/gspylib/os/gsplatform.py
View File

@ -99,11 +99,11 @@ CENTOS = "centos"
EULEROS = "euleros"
KYLIN = "kylin"
OPENEULER = "openeuler"
SUPPORT_WHOLE_PLATFORM_LIST = [SUSE, REDHAT, CENTOS, EULEROS, OPENEULER]
SUPPORT_WHOLE_PLATFORM_LIST = [SUSE, REDHAT, CENTOS, EULEROS, OPENEULER, KYLIN]
# RedhatX platform
SUPPORT_RHEL_SERIES_PLATFORM_LIST = [REDHAT, CENTOS]
SUPPORT_RHEL6X_VERSION_LIST = ["6.4", "6.5", "6.6", "6.7", "6.8", "6.9"]
SUPPORT_RHEL7X_VERSION_LIST = ["7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6"]
SUPPORT_RHEL_SERIES_PLATFORM_LIST = [REDHAT, CENTOS, "kylin"]
SUPPORT_RHEL6X_VERSION_LIST = ["6.4", "6.5", "6.6", "6.7", "6.8", "6.9", "10"]
SUPPORT_RHEL7X_VERSION_LIST = ["7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6", "10"]
SUPPORT_RHEL_SERIES_VERSION_LIST = (SUPPORT_RHEL6X_VERSION_LIST +
SUPPORT_RHEL7X_VERSION_LIST)
# EulerOS 2.3 -> 2.0 SP3
@ -132,7 +132,7 @@ PAK_REDHAT = "RedHat"
_supported_dists = (
'SuSE', 'debian', 'fedora', 'redhat', 'centos', 'euleros', "openEuler",
'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo',
'UnitedLinux', 'turbolinux')
'UnitedLinux', 'turbolinux', 'kylin')
_release_filename = re.compile(r'(\w+)[-_](release|version)')
_lsb_release_version = re.compile(r'(.+)'
' release '
@ -1549,7 +1549,7 @@ class LinuxPlatform(GenericPlatform):
"%s-%s-%s-%s.%s" % (
prefixStr, packageVersion, PAK_REDHAT,
BIT_VERSION, postfixStr))
elif distname in OPENEULER:
elif distname in OPENEULER or distname in KYLIN:
fileName = os.path.join(dirName, "./../../../",
"%s-%s-%s-%s.%s" % (
prefixStr, packageVersion,

2
src/manager/om/script/local/LocalCheckOS.py
View File

@ -1882,7 +1882,7 @@ def CheckPlatformInfo():
data.bits)
g_logger.log("False %s %s" % (data.distname, platformStr))
return
elif (data.distname == "euleros" or data.distname == "openEuler"):
elif (data.distname == "euleros" or data.distname == "openEuler" or data.distname == "kylin"):
mixedType = "%s" % data.distname
platformStr = "%s_%s_%s" % (data.distname, data.version, data.bits)
else: