diff --git a/build.sh b/build.sh index 418e8dac0..aae805185 100755 --- a/build.sh +++ b/build.sh @@ -73,7 +73,7 @@ declare BUILD_DIR="${ROOT_DIR}/dest" PLAT_FORM_STR=$(sh "${ROOT_DIR}/src/get_PlatForm_str.sh") if [ "${PLAT_FORM_STR}"x == "Failed"x ] then - echo "We only support OPENEULER(aarch64), CentOS(x86-64), neokylin(aarch64), kylin(aarch64), CentOS(x86-64) platform." + echo "We only support OPENEULER(aarch64), CentOS(x86-64), neokylin(aarch64), kylin(aarch64), Asianux(x86-64) platform." exit 1; fi diff --git a/docker/dockerfiles.zip b/docker/dockerfiles.zip new file mode 100644 index 000000000..ac319aa91 Binary files /dev/null and b/docker/dockerfiles.zip differ diff --git a/package/package.sh b/package/package.sh index 64023caab..c44926642 100644 --- a/package/package.sh +++ b/package/package.sh @@ -60,8 +60,10 @@ elif [ X"$kernel" == X"neokylin" ]; then dist_version="neokylin" elif [ X"$kernel" == X"kylin" ]; then dist_version="kylin" +elif [ X"$kernel" == X"asianux" ]; then + dist_version="asianux" else - echo "We only support openEuler(aarch64), neokylin(aarch64), kylin(aarch64), CentOS platform." + echo "We only support openEuler(aarch64), neokylin(aarch64), kylin(aarch64), CentOS ,Asianux platform ." echo "Kernel is $kernel" exit 1 fi @@ -713,4 +715,4 @@ if [ -d "${BUILD_DIR}" ]; then rm -rf ${BUILD_DIR} >>"$LOG_FILE" 2>&1 fi echo "now, all packages has finished!" -exit 0 \ No newline at end of file +exit 0 diff --git a/src/gausskernel/Makefile b/src/gausskernel/Makefile index 66266534e..c76ad564f 100644 --- a/src/gausskernel/Makefile +++ b/src/gausskernel/Makefile @@ -632,6 +632,8 @@ else ifeq ($(PLAT_FORM_STR), openeuler_x86_64) cp '$(LIBCURL_LIB_PATH)/libcurl.so.4.6.0' '$(DESTDIR)$(libdir)/libcurl.so.4.6.0' else ifeq ($(PLAT_FORM_STR), centos7.6_x86_64) cp '$(LIBCURL_LIB_PATH)/libcurl.so.4.6.0' '$(DESTDIR)$(libdir)/libcurl.so.4.6.0' +else ifeq ($(PLAT_FORM_STR), asianux_x86_64) + cp '$(LIBCURL_LIB_PATH)/libcurl.so.4.6.0' '$(DESTDIR)$(libdir)/libcurl.so.4.6.0' else ifeq ($(PLAT_FORM_STR), kylin_aarch64) cp '$(LIBCURL_LIB_PATH)/libcurl.so.4.6.0' '$(DESTDIR)$(libdir)/libcurl.so.4.6.0' else ifeq ($(PLAT_FORM_STR), neokylin_aarch64) diff --git a/src/get_PlatForm_str.sh b/src/get_PlatForm_str.sh index 7433076c7..dfdbe91eb 100644 --- a/src/get_PlatForm_str.sh +++ b/src/get_PlatForm_str.sh @@ -64,6 +64,15 @@ then plat_form_str=redhat6.4_"$cpu_bit" fi +################################################################################## +# asianux platform +# the result form like this: asianux7.6_x86_64 +################################################################################## +if [ "$kernel"x = "asianux"x ] +then + plat_form_str=asianux_"$cpu_bit" +fi + ################################################################################## # fedora platform # the result form like this: redhat6.4_x86_64 diff --git a/src/manager/om/script/gspylib/os/gsplatform.py b/src/manager/om/script/gspylib/os/gsplatform.py index d7712b7c0..cc264a5f6 100644 --- a/src/manager/om/script/gspylib/os/gsplatform.py +++ b/src/manager/om/script/gspylib/os/gsplatform.py @@ -99,9 +99,10 @@ CENTOS = "centos" EULEROS = "euleros" KYLIN = "kylin" OPENEULER = "openeuler" -SUPPORT_WHOLE_PLATFORM_LIST = [SUSE, REDHAT, CENTOS, EULEROS, OPENEULER, KYLIN] +ASIANUX = "asianux" +SUPPORT_WHOLE_PLATFORM_LIST = [SUSE, REDHAT, CENTOS, EULEROS, OPENEULER, KYLIN, ASIANUX] # RedhatX platform -SUPPORT_RHEL_SERIES_PLATFORM_LIST = [REDHAT, CENTOS, "kylin"] +SUPPORT_RHEL_SERIES_PLATFORM_LIST = [REDHAT, CENTOS, "kylin", "asianux"] 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 + @@ -126,13 +127,14 @@ PAK_CENTOS = "CentOS" PAK_EULER = "Euler" PAK_OPENEULER = "openEuler" PAK_REDHAT = "RedHat" +PAK_ASIANUX = "asianux" ####################################################### _supported_dists = ( 'SuSE', 'debian', 'fedora', 'redhat', 'centos', 'euleros', "openEuler", 'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo', - 'UnitedLinux', 'turbolinux', 'kylin') + 'UnitedLinux', 'turbolinux', 'kylin', 'asianux') _release_filename = re.compile(r'(\w+)[-_](release|version)') _lsb_release_version = re.compile(r'(.+)' ' release ' @@ -1523,6 +1525,11 @@ class LinuxPlatform(GenericPlatform): prefixStr, packageVersion, PAK_REDHAT, BIT_VERSION, postfixStr)) + elif distname in ASIANUX: + fileName = os.path.join(dirName, "./../../../", + "%s-%s-%s-%s.%s" % ( + prefixStr, packageVersion, PAK_ASIANUX, + BIT_VERSION, postfixStr)) elif distname == SUSE and version.split('.')[0] in ("11", "12"): fileName = os.path.join(dirName, "./../../../", "%s-%s-%s-%s.%s" % ( @@ -1991,3 +1998,4 @@ class UserPlatform(): # global platform class g_Platform = UserPlatform().userPlatform + diff --git a/src/manager/om/script/local/CheckInstall.py b/src/manager/om/script/local/CheckInstall.py index c93de0a5c..10f7c98e3 100644 --- a/src/manager/om/script/local/CheckInstall.py +++ b/src/manager/om/script/local/CheckInstall.py @@ -258,6 +258,7 @@ def checkPath(path_type_in): sep1_ascii = ord('/') sep2_ascii = ord('_') sep3_ascii = ord('-') + sep3_ascii = ord('.') for i in range(0, pathLen): char_check = ord(path_type_in[i]) if (not ( @@ -267,7 +268,8 @@ def checkPath(path_type_in): or char_check == blank_ascii or char_check == sep1_ascii or char_check == sep2_ascii - or char_check == sep3_ascii)): + or char_check == sep3_ascii + or char_check == sep4_ascii)): return False return True diff --git a/src/manager/om/script/local/LocalCheckOS.py b/src/manager/om/script/local/LocalCheckOS.py index 106be23bf..8ace37992 100644 --- a/src/manager/om/script/local/LocalCheckOS.py +++ b/src/manager/om/script/local/LocalCheckOS.py @@ -1908,7 +1908,7 @@ def CheckPlatformInfo(): data.patchlevel, data.bits) g_logger.log("False %s %s" % (data.distname, platformStr)) return - elif (data.distname in ("redhat", "centos")): + elif (data.distname in ("redhat", "centos", "asianux")): if (data.version in ("6.4", "6.5", "6.6", "6.7", "6.8", "6.9")): mixedType = "%s6" % data.distname platformStr = "%s_%s_%s" % (data.distname,