!24 Resolve x86 build failures

From: @chenhaixaing 
Reviewed-by: @gameoverboss 
Signed-off-by: @gameoverboss

sysboost.spec

@@ -2,8 +2,8 @@
 %global __cargo_skip_build 0
 %global __cargo_common_opts %{?__cargo_common_opts} --all
 Name:           sysboost
-Version:        1.0.0
-Release:        0
+Version:        1.0.5
+Release:        2
 Summary:        Sysboost Rpm Build
 License:        Mulan PSL v2
 URL:            https://gitee.com/openeuler/sysboost
@@ -33,24 +33,20 @@ Indicates the preset profile for the bolt..
 export RPM_BUILD_DIR=%_topdir/BUILD
 export RPM_BUILD_SOURCE=%_topdir/SOURCES
 
+rm -rf $RPM_BUILD_SOURCE/%{name}
+rm -rf $RPM_BUILD_ROOT/
+rm -rf $RPM_BUILD_DIR/%{name}
 tar xf $RPM_BUILD_SOURCE/%{name}.tar.xz
 
 %build
-## build binfmt.ko
+# build all
 namer=%{kern_devel_ver}
-#pushd $RPM_BUILD_DIR/%{name}/src/binfmt_rto
-#%ifarch aarch64
-# make %{?_smp_mflags} ARCH=arm64 KDIR=/lib/modules/${namer}/build
-#%else
-#make %{?_smp_mflags} ARCH=x86_64 KDIR=/lib/modules/${namer}/build
-#%endif
-#popd
-
-# build sysboostd and sysboost
 pushd $RPM_BUILD_DIR/%{name}
-%cargo_build -a
-%meson
-%meson_build
+%ifarch aarch64
+make %{?_smp_mflags} ARCH=arm64 KDIR=/lib/modules/${namer}/build
+%else
+# make %{?_smp_mflags} ARCH=x86_64 KDIR=/lib/modules/${namer}/build
+%endif
 popd
 
 %install
@@ -61,52 +57,77 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysboost.d/
 mkdir -p $RPM_BUILD_ROOT/var/lib/sysboost/
 mkdir -p $RPM_BUILD_ROOT/usr/lib/sysboost.d/profile/
 mkdir -p $RPM_BUILD_ROOT/usr/bin
+mkdir -p $RPM_BUILD_ROOT/usr/lib/relocation
 
 # install binfmt.ko
-#pushd $RPM_BUILD_DIR/%{name}
-#install -m 400 ./src/binfmt_rto/binfmt_rto.ko $RPM_BUILD_ROOT/lib/modules/sysboost/
-#popd
-
+%ifarch aarch64
 pushd $RPM_BUILD_DIR/%{name}
-install -D -p -m 400 %{name}.service $RPM_BUILD_ROOT/usr/lib/systemd/system/%{name}.service
-install -D -p -m 500 ./target/release/sysboostd $RPM_BUILD_ROOT%{_bindir}/
-#install -D -p -m 400 ./profile/* $RPM_BUILD_ROOT/usr/lib/sysboost.d/profile/
-%meson_install
+install -m 400 ./src/sysboost_loader/sysboost_loader.ko $RPM_BUILD_ROOT/lib/modules/sysboost/
 popd
+%endif
+
+%ifarch aarch64
+pushd $RPM_BUILD_DIR/%{name}
+install -D -p ./src/sysboost.service/%{name}.service $RPM_BUILD_ROOT/usr/lib/systemd/system/%{name}.service
+install -D -p ./src/sysboost.service/%{name}d_exec_stop.sh $RPM_BUILD_ROOT/etc/systemd/system/%{name}d_exec_stop.sh
+install -D -p ./src/sysboostd/target/debug/sysboostd $RPM_BUILD_ROOT%{_bindir}/
+install -D -p ./build/src/elfmerge/elfmerge $RPM_BUILD_ROOT%{_bindir}/
+xz -dk ./profile/*.xz
+install -D -p ./profile/* $RPM_BUILD_ROOT/usr/lib/sysboost.d/profile/
+popd
+%endif
+
+# install sysboost_static_template
+%ifarch aarch64
+pushd $RPM_BUILD_DIR/%{name}/build/src/static_template/
+xz ./sysboost_static_template
+mv -f ./sysboost_static_template.xz ./sysboost_static_template.relocation
+install -D -p ./sysboost_static_template.relocation $RPM_BUILD_ROOT/usr/lib/relocation
+popd
+%endif
 
 %check
 
 %files
+%ifarch aarch64
 %defattr(400,root,root,-)
 %dir %attr(700, root, root) /etc/sysboost.d/
 %dir %attr(700, root, root) /var/lib/sysboost/
-#%dir %attr(500, root, root) /lib/modules/sysboost/
-%{_bindir}/*
-%{_libdir}/*
-%attr(500, root, root) /usr/bin/sysboost
+%dir %attr(500, root, root) /lib/modules/sysboost/
+%dir %attr(500, root, root) /usr/lib/relocation
+%attr(500, root, root) /usr/bin/elfmerge
 %attr(500, root, root) /usr/bin/sysboostd
-%attr(600, root, root) /etc/sysboost.d
 /usr/lib/systemd/system/%{name}.service
-#%attr(0400,root,root)  /lib/modules/sysboost/*
+/etc/systemd/system/%{name}d_exec_stop.sh
+%ifarch aarch64
+%attr(0400,root,root)  /lib/modules/sysboost/*
+%endif
+%attr(500, root, root) /usr/lib/relocation/sysboost_static_template.relocation
 
 %files profile
-#%dir %attr(500, root, root)  /usr/lib/sysboost.d/profile/
-#%attr(0400,root,root)  /usr/lib/sysboost.d/profile/*
+%dir %attr(500, root, root)  /usr/lib/sysboost.d/profile/
+%attr(0400,root,root)  /usr/lib/sysboost.d/profile/*
 
 %doc
-
-%post
-%systemd_post %{name}.service
-
-%preun
-%systemd_preun %{name}.service
-
-%postun
-%systemd_postun_with_restart %{name}.service
+%endif
 
 %changelog
+* Wed Dec 18 2024 chenhaixiang <chenhaixiang3@huawei.com> - 1.0.5-2
+- Desc: Resolve x86 build failures
+
+* Wed Dec 11 2024 chenhaixiang <chenhaixiang3@huawei.com> - 1.0.5-1
+- Desc: init 22.03-LTS-SP4
+
+* Tue Oct 17 2023 Liu Yuntao <liuyuntao10@huawei.com> - 1.0.0-2
+- DESC: 1. sync from openeuler-23.09
+-       2. update pathes corresponding to code refactor
+
+* Thu Aug 24 2023 liutie <liutie4@huawei.com> - 1.0.0-1
+- ID:NA
+- SUG:NA
+- DESC: remove post scriptlet
+
 * Tue Jun 13 2023 liutie <liutie4@huawei.com> - 1.0.0-0
-- Type:enhancement
 - ID:NA
 - SUG:NA
 - DESC: init sysboost