From 821694376ad3653005bc2641cf39d3761dc81c24 Mon Sep 17 00:00:00 2001 From: Amir Sanjar Date: Thu, 15 Jul 2021 20:42:13 +0000 Subject: [PATCH] adding ppc64le support for kibana --- .../src/common/kibana/install_kibana.sh | 4 +++ .../common/kibana/patch0-kibana-arm64.diff | 36 ------------------- .../common/kibana/patch0-kibana-platform.diff | 26 ++++++++++++++ .../kibana/patch4-kibana-os-platform.diff | 11 ++++++ 4 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 bigtop-packages/src/common/kibana/patch0-kibana-arm64.diff create mode 100644 bigtop-packages/src/common/kibana/patch0-kibana-platform.diff create mode 100644 bigtop-packages/src/common/kibana/patch4-kibana-os-platform.diff diff --git a/bigtop-packages/src/common/kibana/install_kibana.sh b/bigtop-packages/src/common/kibana/install_kibana.sh index 89cade9901..72c56704c2 100644 --- a/bigtop-packages/src/common/kibana/install_kibana.sh +++ b/bigtop-packages/src/common/kibana/install_kibana.sh @@ -113,6 +113,10 @@ fi if [ "${ARCH}" = "aarch64" ];then cp -ar $BUILD_DIR/kibana-*-linux-arm64/* $PREFIX/$LIB_DIR/ fi +if [ "${ARCH}" = "ppc64le" ];then + cp -ar $BUILD_DIR/kibana-*-linux-ppc64*/* $PREFIX/$LIB_DIR/ +fi + chmod 755 $PREFIX/$LIB_DIR/* -R diff --git a/bigtop-packages/src/common/kibana/patch0-kibana-arm64.diff b/bigtop-packages/src/common/kibana/patch0-kibana-arm64.diff deleted file mode 100644 index 6c71b8200d..0000000000 --- a/bigtop-packages/src/common/kibana/patch0-kibana-arm64.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff -ruaN kibana-5.4.1-orig/tasks/build/os_packages.js kibana-5.4.1-arm64-support/tasks/build/os_packages.js ---- kibana-5.4.1-orig/tasks/build/os_packages.js 2020-07-22 14:51:45.240239878 +0800 -+++ kibana-5.4.1-arm64-support/tasks/build/os_packages.js 2020-07-22 14:51:34.283874336 +0800 -@@ -14,7 +14,7 @@ - grunt.file.mkdir(targetDir); - - config.get('platforms') -- .filter(({ name }) => /linux-x86(_64)?$/.test(name)) -+ .filter(({ name }) => /linux-(x86|x86_64|arm64)?$/.test(name)) - .forEach(({ buildDir, debArch, rpmArch }) => { - const baseOptions = [ - '--force', -diff -ruaN kibana-5.4.1-orig/tasks/config/platforms.js kibana-5.4.1-arm64-support/tasks/config/platforms.js ---- kibana-5.4.1-orig/tasks/config/platforms.js 2020-07-22 14:51:45.244239999 +0800 -+++ kibana-5.4.1-arm64-support/tasks/config/platforms.js 2020-07-22 14:51:34.283874336 +0800 -@@ -12,6 +12,7 @@ - 'darwin-x64', - 'linux-x64', - 'linux-x86', -+ 'linux-arm64', - 'windows-x86' - ].map(function (baseName) { - const win = baseName === 'windows-x86'; -@@ -42,10 +43,12 @@ - let rpmArch; - if (name.match('linux')) { - debArch = name.match('x86_64') ? 'amd64' : 'i386'; -+ debArch = name.match('arm64') ? 'arm64' : debArch; - debName = `kibana-${version}-${debArch}.deb`; - debPath = resolve(rootPath, `target/${debName}`); - - rpmArch = name.match('x86_64') ? 'x86_64' : 'i686'; -+ rpmArch = name.match('arm64') ? 'arm64' : rpmArch; - rpmName = `kibana-${version}-${rpmArch}.rpm`; - rpmPath = resolve(rootPath, `target/${rpmName}`); - } diff --git a/bigtop-packages/src/common/kibana/patch0-kibana-platform.diff b/bigtop-packages/src/common/kibana/patch0-kibana-platform.diff new file mode 100644 index 0000000000..54c5fd186b --- /dev/null +++ b/bigtop-packages/src/common/kibana/patch0-kibana-platform.diff @@ -0,0 +1,26 @@ +--- kibana-5.4.1/tasks/config/platforms.js 2017-05-27 12:53:15.000000000 +0000 ++++ kibana-5.4.1/tasks/config/platforms.js 2021-07-14 21:37:50.423345645 +0000 +@@ -12,6 +12,8 @@ + 'darwin-x64', + 'linux-x64', + 'linux-x86', ++ 'linux-arm64', ++ 'linux-ppc64le', + 'windows-x86' + ].map(function (baseName) { + const win = baseName === 'windows-x86'; +@@ -42,10 +44,14 @@ + let rpmArch; + if (name.match('linux')) { + debArch = name.match('x86_64') ? 'amd64' : 'i386'; ++ debArch = name.match('arm64') ? 'arm64' : debArch; ++ debArch = name.match('ppc64le') ? 'ppc64le' : debArch; + debName = `kibana-${version}-${debArch}.deb`; + debPath = resolve(rootPath, `target/${debName}`); + + rpmArch = name.match('x86_64') ? 'x86_64' : 'i686'; ++ rpmArch = name.match('arm64') ? 'arm64' : rpmArch; ++ rpmArch = name.match('ppc64le') ? 'ppc64le' : rpmArch; + rpmName = `kibana-${version}-${rpmArch}.rpm`; + rpmPath = resolve(rootPath, `target/${rpmName}`); + } diff --git a/bigtop-packages/src/common/kibana/patch4-kibana-os-platform.diff b/bigtop-packages/src/common/kibana/patch4-kibana-os-platform.diff new file mode 100644 index 0000000000..aec4dec521 --- /dev/null +++ b/bigtop-packages/src/common/kibana/patch4-kibana-os-platform.diff @@ -0,0 +1,11 @@ +--- kibana-5.4.1/tasks/build/os_packages.js 2017-05-27 12:53:15.000000000 +0000 ++++ kibana-5.4.1/tasks/build/os_packages.js 2021-07-14 21:37:50.423345645 +0000 +@@ -14,7 +14,7 @@ + grunt.file.mkdir(targetDir); + + config.get('platforms') +- .filter(({ name }) => /linux-x86(_64)?$/.test(name)) ++ .filter(({ name }) => /linux-(x86|x86_64|arm64|ppc64le)?$/.test(name)) + .forEach(({ buildDir, debArch, rpmArch }) => { + const baseOptions = [ + '--force',