39 lines
2.2 KiB
Diff
39 lines
2.2 KiB
Diff
|
diff -Naur a/openGauss-server-2.1.0/build/script/package_opengauss.sh b/openGauss-server-2.1.0/build/script/package_opengauss.sh
|
||
|
|
--- a/openGauss-server-2.1.0/build/script/package_opengauss.sh 2024-11-06 09:45:40.281917930 +0800
|
||
|
|
+++ b/openGauss-server-2.1.0/build/script/package_opengauss.sh 2024-11-06 15:13:03.650408634 +0800
|
||
|
|
@@ -66,6 +66,9 @@
|
||
|
|
dist_version="KylinSec"
|
||
|
|
elif [ X"$kernel" = X"ubuntu" ]; then
|
||
|
|
dist_version="Ubuntu"
|
||
|
|
+# as the last judgement condition, the CUSTOM_VENDOR_PLACEHOLDER will be replace by vendor macro in spec file
|
||
|
|
+elif [ X"$kernel" = X"CUSTOM_VENDOR_PLACEHOLDER_LOWERCASE" ]; then
|
||
|
|
+ dist_version="CUSTOM_VENDOR_PLACEHOLDER"
|
||
|
|
else
|
||
|
|
echo "We only support openEuler(aarch64), EulerOS(aarch64), CentOS, Kylin(aarch64), KylinSec(aarch64) and Ubuntu(x86) platform."
|
||
|
|
echo "Kernel is $kernel"
|
||
|
|
@@ -124,7 +127,7 @@
|
||
|
|
##add platform architecture information
|
||
|
|
PLATFORM_ARCH=$(uname -p)
|
||
|
|
if [ "$PLATFORM_ARCH"X == "aarch64"X ] ; then
|
||
|
|
- if [ "$dist_version" != "openEuler" ] && [ "$dist_version" != "EulerOS" ] && [ "$dist_version" != "Kylin" ] && [ "$dist_version" != "KylinSec" ] ; then
|
||
|
|
+ if [ "$dist_version" != "openEuler" ] && [ "$dist_version" != "EulerOS" ] && [ "$dist_version" != "Kylin" ] && [ "$dist_version" != "KylinSec" ] && [ "$dist_version" != "CUSTOM_VENDOR_PLACEHOLDER" ]; then
|
||
|
|
echo "We only support NUMA on openEuler(aarch64), EulerOS(aarch64), Kylin(aarch64), KylinSec(aarch64) platform."
|
||
|
|
exit 1
|
||
|
|
fi
|
||
|
|
diff -Naur a/openGauss-server-2.1.0/src/get_PlatForm_str.sh b/openGauss-server-2.1.0/src/get_PlatForm_str.sh
|
||
|
|
--- a/openGauss-server-2.1.0/src/get_PlatForm_str.sh 2024-11-06 09:45:40.281917930 +0800
|
||
|
|
+++ b/openGauss-server-2.1.0/src/get_PlatForm_str.sh 2024-11-06 14:40:31.071558697 +0800
|
||
|
|
@@ -163,6 +163,12 @@
|
||
|
|
# other platform
|
||
|
|
#
|
||
|
|
##################################################################################
|
||
|
|
+# as the last judgement condition, the CUSTOM_VENDOR_PLACEHOLDER will be replace by vendor macro in spec file
|
||
|
|
+if [ -z "$plat_form_str" ] && [ "$kernel"x = "CUSTOM_VENDOR_PLACEHOLDER_LOWERCASE"x ]
|
||
|
|
+then
|
||
|
|
+ plat_form_str=CUSTOM_VENDOR_PLACEHOLDER_"$cpu_bit"
|
||
|
|
+fi
|
||
|
|
+
|
||
|
|
if [ -z "$plat_form_str" ]
|
||
|
|
then
|
||
|
|
echo "Failed"
|