!81 [sync] 同步master修改到openEuler-22.03-LTS-Next

From: @wenwj0 
Reviewed-by: @macchen1 
Signed-off-by: @macchen1

01-lock-triple-beam-version-to-1.3.0.patch

@@ -0,0 +1,26 @@
+From 2c87b545bf16d9a2433179a56abc17b3efdf1fc4 Mon Sep 17 00:00:00 2001
+From: sunyanan <sunyanan@xfusion.com>
+Date: Thu, 13 Jul 2023 23:26:11 +0800
+Subject: [PATCH] lock triple-beam version to 1.3.0
+
+---
+ .../hadoop-yarn-applications-catalog-webapp/package.json               | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
+index f09442c..1431303 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
+@@ -14,6 +14,9 @@
+         "bootstrap": "~3.3.7",
+         "roboto-fontface": "0.10.0"
+     },
++    "resolutions": {
++        "triple-beam": "1.3.0"
++    },
+     "devDependencies": {
+         "requirejs": "^2.1.0",
+         "shelljs": "^0.2.6",
+-- 
+1.8.3.1
+

README.md

@@ -1,11 +1,21 @@
 # hadoop
 
 #### 介绍
-A software platform for processing vast amounts of data
+Hadoop是一个用Java编写的Apache开源框架，允许使用简单的编程模型跨计算机集群分布式处理大型数据集。Hadoop框架工作的应用程序在跨计算机集群提供分布式存储和计算的环境中工作。Hadoop旨在从单个服务器扩展到数千个机器，每个都提供本地计算和存储。
 
 #### 软件架构
-软件架构说明
+Hadoop框架包括以下四个模块：
+- Hadoop Common: 这些是其他Hadoop模块所需的Java库和实用程序。这些库提供文件系统和操作系统级抽象，并包含启动Hadoop所需的Java文件和脚本。
+- Hadoop YARN: 这是一个用于作业调度和集群资源管理的框架。
+- Hadoop Distributed File System (HDFS): 分布式文件系统，提供对应用程序数据的高吞吐量访问。
+- Hadoop MapReduce：这是基于YARN的用于并行处理大数据集的系统。
+自2012年以来，“Hadoop”这个术语通常不仅指上述基本模块，而且还指向可以安装在Hadoop之上或之上的附加软件包的收集，例如Apache Pig，Apache Hive，Apache HBase，Apache Spark等。
 
+#### ARM支持：
+
+1. 移植指南：https://support.huaweicloud.com/prtg-apache-kunpengbds/kunpenghadoop_02_0001.html
+2. 部署指南：https://support.huaweicloud.com/dpmg-apache-kunpengbds/kunpenghadoop_04_0001.html
+3. 调优指南：XXX
 
 #### 安装教程
 

hadoop.spec

@@ -11,7 +11,7 @@
 %define _binaries_in_noarch_packages_terminate_build 0
 Name:   hadoop
 Version: 3.3.4
-Release: 2
+Release: 4
 Summary: A software platform for processing vast amounts of data
 # The BSD license file is missing
 # https://issues.apache.org/jira/browse/HADOOP-9849
@@ -36,6 +36,8 @@ Source15: node-12.22.1-linux-x64.tar.gz
 Source16: node-v12.22.1-linux-arm64.tar.gz
 Source17: settings.xml
 
+Patch0: 01-lock-triple-beam-version-to-1.3.0.patch 
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel 
 BuildRequires: cyrus-sasl-devel chrpath systemd protobuf2-compiler protobuf2-devel protobuf2-java protobuf2
@@ -207,7 +209,6 @@ offering local computation and storage.
 This package contains test related resources for Apache Hadoop.
 
 %package yarn
-BuildArch: noarch
 Summary: Apache Hadoop YARN
 Requires: %{name}-common = %{version}-%{release}
 Requires: %{name}-mapreduce = %{version}-%{release}
@@ -243,6 +244,7 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
 %prep
 %autosetup -p1 -n %{name}-%{version}-src
 cp %{SOURCE17} ./
+sed -i "s,@HOME@,${HOME},g" settings.xml
 mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar -s settings.xml 
 mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar -s settings.xml
 mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-api -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-api.jar -s settings.xml
@@ -250,17 +252,17 @@ mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-benchma
 mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar -s settings.xml
 mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar -s settings.xml
 
-mkdir -p /home/abuild/repository/com/github/eirslett/node/12.22.1/
+mkdir -p ${HOME}/repository/com/github/eirslett/node/12.22.1/
-cp %{SOURCE15} /home/abuild/repository/com/github/eirslett/node/12.22.1/
+cp %{SOURCE15} ${HOME}/repository/com/github/eirslett/node/12.22.1/
-cp %{SOURCE16} /home/abuild/repository/com/github/eirslett/node/12.22.1/
+cp %{SOURCE16} ${HOME}/repository/com/github/eirslett/node/12.22.1/
-mv /home/abuild/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz /home/abuild/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz
+mv ${HOME}/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz ${HOME}/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz
-mkdir -p /home/abuild/repository/com/github/eirslett/yarn/1.22.5/
+mkdir -p ${HOME}/repository/com/github/eirslett/yarn/1.22.5/
-cp %{SOURCE14} /home/abuild/repository/com/github/eirslett/yarn/1.22.5/
+cp %{SOURCE14} ${HOME}/repository/com/github/eirslett/yarn/1.22.5/
-mv /home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz /home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz
+mv ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz
-tar -xzvf /home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C /home/abuild/repository/com/github/eirslett/yarn/1.22.5/
+tar -xzvf ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C ${HOME}/repository/com/github/eirslett/yarn/1.22.5/
 npm config set registry https://repo.huaweicloud.com/repository/npm/
 npm cache clean -f
-/home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set registry https://repo.huaweicloud.com/repository/npm/ -g
+${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set registry https://repo.huaweicloud.com/repository/npm/ -g
 
 %pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-hdfs-project/hadoop-hdfs
 %pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy 
@@ -1130,10 +1132,17 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
 
 %changelog
-* Fri Apr 14 2023 Dongxing Wang <dxwangk@isoftstone.com> - 3.3.4-2
+* Wed Aug 16 2023 Jia Chao <jiac13@chinaunicom.cn> - 3.3.4-4
-- sync fix EBS install problem
+- fix: use $HOME rather than /home/abuild, suit for all buildtools.
+- fix: yarn have ELF bin, not noarch at all.
 
-* Tue Sep 20 2022 xiasenlin <xiasenlin1@huawei.com> - 3.3.4-1
+* Thu Jul 13 2023 sunyanan <sunyanan@xfusion.com> - 3.3.4-3
+- lock triple-beam version to 1.3.0 
+
+* Thu Mar 9 2023 xiexing <xiexing4@hisilicon.com> - 3.3.4-2
+- fix EBS install problem
+
+* Mon Sep 19 2022 xiasenlin <xiasenlin1@huawei.com> - 3.3.4-1
 - fix cve CVE-2021-25642
 
 * Thu Sep 8 2022 xiasenlin <xiasenlin1@huawei.com> - 3.3.3-2

settings.xml

@@ -3,7 +3,7 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
 
-  <localRepository>/home/abuild/repository/</localRepository>
+  <localRepository>@HOME@/repository/</localRepository>
   <pluginGroups>
   </pluginGroups>
   <proxies>