From 62e4267668dee1291c8d681656a26ab69cb85a29 Mon Sep 17 00:00:00 2001 From: morningman Date: Wed, 9 Apr 2025 00:20:00 -0700 Subject: [PATCH 1/2] [deps](jindofs) build.sh support any version of jindofs --- build.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.sh b/build.sh index 8f057b5b5c8e0a..dd85b8142e4a1b 100755 --- a/build.sh +++ b/build.sh @@ -776,12 +776,12 @@ if [[ "${BUILD_FE}" -eq 1 ]]; then # copy jindofs jars, only support for Linux x64 or arm if [[ "${TARGET_SYSTEM}" == 'Linux' ]] && [[ "${TARGET_ARCH}" == 'x86_64' ]]; then - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-6.3.4.jar" "${DORIS_OUTPUT}/fe/lib"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-ubuntu22-x86_64-6.3.4.jar" "${DORIS_OUTPUT}/fe/lib"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-6.3.4.jar" "${DORIS_OUTPUT}/fe/lib"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-[0-9].*.jar" "${DORIS_OUTPUT}/fe/lib"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-ubuntu22-x86_64-[0-9].*.jar" "${DORIS_OUTPUT}/fe/lib"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-[0-9].*.jar" "${DORIS_OUTPUT}/fe/lib"/ elif [[ "${TARGET_SYSTEM}" == 'Linux' ]] && [[ "${TARGET_ARCH}" == 'aarch64' ]]; then - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-el7-aarch64-6.3.4.jar" "${DORIS_OUTPUT}/fe/lib"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-6.3.4.jar" "${DORIS_OUTPUT}/fe/lib"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-el7-aarch64-[0-9].*.jar" "${DORIS_OUTPUT}/fe/lib"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-[0-9].*.jar" "${DORIS_OUTPUT}/fe/lib"/ fi cp -r -p "${DORIS_HOME}/minidump" "${DORIS_OUTPUT}/fe"/ @@ -924,12 +924,12 @@ EOF # copy jindofs jars, only support for Linux x64 or arm if [[ "${TARGET_SYSTEM}" == 'Linux' ]] && [[ "$TARGET_ARCH" == 'x86_64' ]]; then - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-6.3.4.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-ubuntu22-x86_64-6.3.4.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-6.3.4.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-[0-9].*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-ubuntu22-x86_64-[0-9].*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-[0-9].*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ elif [[ "${TARGET_SYSTEM}" == 'Linux' ]] && [[ "$TARGET_ARCH" == 'aarch64' ]]; then - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-el7-aarch64-6.3.4.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-6.3.4.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-el7-aarch64-[0-9].*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-[0-9].*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ fi cp -r -p "${DORIS_THIRDPARTY}/installed/webroot"/* "${DORIS_OUTPUT}/be/www"/ From c4e17fcdee7ed7337c0c8af7e3c780dd4eb5fa64 Mon Sep 17 00:00:00 2001 From: morningman Date: Wed, 9 Apr 2025 15:47:26 +0800 Subject: [PATCH 2/2] 2 --- build.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.sh b/build.sh index dd85b8142e4a1b..659b7bce9f802e 100755 --- a/build.sh +++ b/build.sh @@ -776,12 +776,12 @@ if [[ "${BUILD_FE}" -eq 1 ]]; then # copy jindofs jars, only support for Linux x64 or arm if [[ "${TARGET_SYSTEM}" == 'Linux' ]] && [[ "${TARGET_ARCH}" == 'x86_64' ]]; then - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-[0-9].*.jar" "${DORIS_OUTPUT}/fe/lib"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-ubuntu22-x86_64-[0-9].*.jar" "${DORIS_OUTPUT}/fe/lib"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-[0-9].*.jar" "${DORIS_OUTPUT}/fe/lib"/ + cp -r -p "${DORIS_THIRDPARTY}"/installed/jindofs_libs/jindo-core-[0-9]*.jar "${DORIS_OUTPUT}/fe/lib"/ + cp -r -p "${DORIS_THIRDPARTY}"/installed/jindofs_libs/jindo-core-linux-ubuntu22-x86_64-[0-9]*.jar "${DORIS_OUTPUT}/fe/lib"/ + cp -r -p "${DORIS_THIRDPARTY}"/installed/jindofs_libs/jindo-sdk-[0-9]*.jar "${DORIS_OUTPUT}/fe/lib"/ elif [[ "${TARGET_SYSTEM}" == 'Linux' ]] && [[ "${TARGET_ARCH}" == 'aarch64' ]]; then - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-el7-aarch64-[0-9].*.jar" "${DORIS_OUTPUT}/fe/lib"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-[0-9].*.jar" "${DORIS_OUTPUT}/fe/lib"/ + cp -r -p "${DORIS_THIRDPARTY}"/installed/jindofs_libs/jindo-core-linux-el7-aarch64-[0-9]*.jar "${DORIS_OUTPUT}/fe/lib"/ + cp -r -p "${DORIS_THIRDPARTY}"/installed/jindofs_libs/jindo-sdk-[0-9]*.jar "${DORIS_OUTPUT}/fe/lib"/ fi cp -r -p "${DORIS_HOME}/minidump" "${DORIS_OUTPUT}/fe"/ @@ -924,12 +924,12 @@ EOF # copy jindofs jars, only support for Linux x64 or arm if [[ "${TARGET_SYSTEM}" == 'Linux' ]] && [[ "$TARGET_ARCH" == 'x86_64' ]]; then - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-[0-9].*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-ubuntu22-x86_64-[0-9].*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-[0-9].*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ + cp -r -p "${DORIS_THIRDPARTY}"/installed/jindofs_libs/jindo-core-[0-9]*.jar "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ + cp -r -p "${DORIS_THIRDPARTY}"/installed/jindofs_libs/jindo-core-linux-ubuntu22-x86_64-[0-9]*.jar "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ + cp -r -p "${DORIS_THIRDPARTY}"/installed/jindofs_libs/jindo-sdk-[0-9]*.jar "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ elif [[ "${TARGET_SYSTEM}" == 'Linux' ]] && [[ "$TARGET_ARCH" == 'aarch64' ]]; then - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-el7-aarch64-[0-9].*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ - cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-[0-9].*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-core-linux-el7-aarch64-[0-9]*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ + cp -r -p "${DORIS_THIRDPARTY}/installed/jindofs_libs/jindo-sdk-[0-9]*.jar" "${DORIS_OUTPUT}/be/lib/java_extensions/preload-extensions"/ fi cp -r -p "${DORIS_THIRDPARTY}/installed/webroot"/* "${DORIS_OUTPUT}/be/www"/