!904 support ubuntu platform

Merge pull request !904 from zhengxue/ubuntu_dev
This commit is contained in:
opengauss-bot
2021-04-21 14:45:58 +08:00
committed by Gitee
5 changed files with 1321 additions and 2 deletions

View File

@ -51,8 +51,10 @@ elif [ X"$kernel" == X"openeuler" ]; then
dist_version="OPENEULER" dist_version="OPENEULER"
elif [ X"$kernel" == X"kylin" ]; then elif [ X"$kernel" == X"kylin" ]; then
dist_version="KYLIN" dist_version="KYLIN"
elif [ X"$kernel" = X"ubuntu" ]; then
dist_version="UBUNTU"
else else
echo "Only support EulerOS, OPENEULER(aarch64), CentOS and Kylin(aarch64) platform." echo "Only support EulerOS, OPENEULER(aarch64), CentOS, Kylin(aarch64) and Ubuntu(x86) platform."
echo "Kernel is $kernel" echo "Kernel is $kernel"
exit 1 exit 1
fi fi

File diff suppressed because it is too large Load Diff

View File

@ -61,8 +61,10 @@ elif [ X"$kernel" == X"euleros" ]; then
dist_version="EulerOS" dist_version="EulerOS"
elif [ X"$kernel" == X"kylin" ]; then elif [ X"$kernel" == X"kylin" ]; then
dist_version="Kylin" dist_version="Kylin"
elif [ X"$kernel" = X"ubuntu" ]; then
dist_version="Ubuntu"
else else
echo "We only support openEuler(aarch64), EulerOS(aarch64), CentOS, Kylin(aarch64) platform." echo "We only support openEuler(aarch64), EulerOS(aarch64), CentOS, Kylin(aarch64) and Ubuntu(x86) platform."
echo "Kernel is $kernel" echo "Kernel is $kernel"
exit 1 exit 1
fi fi

View File

@ -702,6 +702,8 @@ 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' cp '$(LIBCURL_LIB_PATH)/libcurl.so.4.6.0' '$(DESTDIR)$(libdir)/libcurl.so.4.6.0'
else ifeq ($(PLAT_FORM_STR), kylin_aarch64) else ifeq ($(PLAT_FORM_STR), kylin_aarch64)
cp '$(LIBCURL_LIB_PATH)/libcurl.so.4.6.0' '$(DESTDIR)$(libdir)/libcurl.so.4.6.0' cp '$(LIBCURL_LIB_PATH)/libcurl.so.4.6.0' '$(DESTDIR)$(libdir)/libcurl.so.4.6.0'
else ifeq ($(PLAT_FORM_STR), ubuntu18.04_x86_64)
cp '$(LIBCURL_LIB_PATH)/libcurl.so.4.6.0' '$(DESTDIR)$(libdir)/libcurl.so.4.6.0'
else else
cp '$(LIBCURL_LIB_PATH)/libcurl.so.4.5.0' '$(DESTDIR)$(libdir)/libcurl.so.4.5.0' cp '$(LIBCURL_LIB_PATH)/libcurl.so.4.5.0' '$(DESTDIR)$(libdir)/libcurl.so.4.5.0'
endif endif

View File

@ -132,6 +132,15 @@ then
plat_form_str=kylin_"$cpu_bit" plat_form_str=kylin_"$cpu_bit"
fi fi
##################################################################################
# ubuntu platform
# the result form like this: ubuntu_x86_64
##################################################################################
if [ "$kernel"x = "ubuntu"x ]
then
plat_form_str=ubuntu18.04_"$cpu_bit"
fi
################################################################################## ##################################################################################
# #