!17 对aarch64架构ovirt-engine服务启动失败的修改适配

From: @wang--ge
Reviewed-by: @jxy_git
Signed-off-by: @jxy_git

0001-add-dependent-package-to-lib.patch

@@ -1,12 +1,48 @@
-From bf2fc65a5941554c6d76d766ee78e0cac060a1d6 Mon Sep 17 00:00:00 2001
+From c26b3207515396163d30dfcfff4c1b2d51e3b7d0 Mon Sep 17 00:00:00 2001
 From: tmp <tmp@huawei.com>
-Date: Mon, 13 Sep 2021 17:28:27 +0800
+Date: Tue, 14 Sep 2021 19:50:06 +0800
 Subject: [PATCH] add dependent package to lib
 
 ---
- backend/pom.xml | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
+ backend/manager/modules/utils/pom.xml | 24 ++++++++++++++++++++++++
+ backend/pom.xml                       | 24 ++++++++++++++++++++++++
+ 2 files changed, 48 insertions(+)
 
+diff --git a/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml
+index dc6f6ca..163d31d 100644
+--- a/backend/manager/modules/utils/pom.xml
++++ b/backend/manager/modules/utils/pom.xml
+@@ -167,6 +167,30 @@
+           </execution>
+         </executions>
+     </plugin>
++
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-dependency-plugin</artifactId>
++        <executions>
++          <execution>
++            <id>copy</id>
++            <goals>
++              <goal>copy</goal>
++            </goals>
++            <phase>package</phase>
++            <configuration>
++              <artifactItems>
++                <artifactItem>
++                  <groupId>org.ebaysf.web</groupId>
++                  <artifactId>cors-filter</artifactId>
++                  <version>1.0.1</version>
++                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
++                </artifactItem>
++              </artifactItems>
++            </configuration>
++          </execution>
++        </executions>
++      </plugin>
+     </plugins>
+   </build>
+ 
 diff --git a/backend/pom.xml b/backend/pom.xml
 index 996f4e8..6b77fdd 100644
 --- a/backend/pom.xml

ovirt-engine.spec

@@ -161,7 +161,7 @@ getent passwd %1 >/dev/null || useradd -r -u %2 -g %3 -c %5 -s /sbin/nologin -d
 
 Name:		ovirt-engine
 Version:	4.4.7.7
-Release:	2
+Release:	3
 Summary:	Management server for Open Virtualization
 Group:		%{ovirt_product_group}
 License:	Apache 2.0
@@ -897,7 +897,10 @@ cp gg-sso.conf %{buildroot}%{engine_etc}/engine.conf.d/
 
 install -dm 755 "%{buildroot}%{engine_data}/modules/common/org/apache/sshd/main"
 cp backend/target/lib/sshd-core-2.6.0.jar %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main
-sed -i 's/sshd-core/sshd-core-2.6.0/g' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
+sed -i '/sshd-core.jar/a\    <resource-root path="sshd-core-2.6.0.jar"/>' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
+
+install -dm 755 "%{buildroot}%{_datadir}/java/ebay-cors-filter"
+cp backend/manager/modules/utils/target/lib/cors-filter-1.0.1.jar %{buildroot}%{_datadir}/java/ebay-cors-filter/cors-filter.jar
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -1016,7 +1019,7 @@ fi
 %{engine_ear}/welcome.war/
 %{engine_etc}/osinfo.conf.d/
 %{engine_jboss_modules}/
-
+%{_datadir}/java/ebay-cors-filter/cors-filter.jar
 %{engine_data}/services/ovirt-engine
 %{_unitdir}/ovirt-engine.service
 
@@ -1250,6 +1253,9 @@ fi
 %{engine_data}/setup/bin/ovirt-engine-health
 
 %changelog
+* Wed Sep 15 2021 Ge Wang <wangge20@huawei.com> - 4.4.7.7-3
+- Fix aarch64 setup error 
+
 * Tue Sep 14 2021 Ge Wang <wangge20@huawei.com> - 4.4.7.7-2
 - Fix access denied and setup error due to sshd-core version mismatch and distribution nonrecognition