diff --git a/oec-hardware-1.0.0-system.patch b/oec-hardware-1.0.0-system.patch new file mode 100644 index 0000000..289fb94 --- /dev/null +++ b/oec-hardware-1.0.0-system.patch @@ -0,0 +1,6 @@ +diff tests/system_new.py tests/system.py > oec-hardware-1.0.0-system.patch +155,156c155 +< except_list = ["/modules.dep$", "/modules.symbols$", "/modules.dep.bin$", "/modules.symbols.bin$"] +< if os.system("rpm -V --nomtime --nomode --nocontexts %s | grep -Ev '%s'" % (kernel_rpm, "|".join(except_list))) is 0: +--- +> if not os.system("rpm -V --nomtime --nomode --nocontexts %s" % kernel_rpm) is 0: diff --git a/oec-hardware.spec b/oec-hardware.spec index f4de8bc..a86909a 100644 --- a/oec-hardware.spec +++ b/oec-hardware.spec @@ -1,77 +1,81 @@ -%define version 1.0.0 -%define release 2 -%define debug_package %{nil} -%global _build_id_links none -%undefine __brp_mangle_shebangs - -Name: oec-hardware -Summary: openEuler Hardware Compatibility Test Suite -Version: %{version} -Release: %{release} -Group: Development/Tools -License: Mulan PSL v2 -URL: https://gitee.com/openeuler/oec-hardware -Source0: %{name}-%{version}.tar.bz2 - -Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: gcc -Requires: kernel-devel, kernel-headers, dmidecode, tar -Requires: qperf, fio, memtester -Requires: kernel >= 4 -Requires: python3 - -# server subpackage -%package server -Summary: openEuler Hardware Compatibility Test Server -Group: Development/Tools -Requires: python3, python3-devel, nginx, tar, qperf, psmisc - -%description -openEuler Hardware Compatibility Test Suite - -%description server -openEuler Hardware Compatibility Test Server - -%prep -%setup -q -c - -%build -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; -DESTDIR=$RPM_BUILD_ROOT VERSION_RELEASE=%{version} make - -%install -DESTDIR=$RPM_BUILD_ROOT make install - -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; - -%pre - -%post - -%files -%defattr(-,root,root) -/usr/bin/oech -/usr/share/oech/kernelrelease.json -/usr/share/oech/lib/hwcompatible -/usr/share/oech/lib/tests -/usr/lib/systemd/system/oech.service -%dir /var/oech -%dir /usr/share/oech/lib -%dir /usr/share/oech - -%files server -%defattr(-,root,root) -/usr/share/oech/lib/server -/usr/share/oech/lib/server/uwsgi.ini -/usr/share/oech/lib/server/uwsgi.conf -/usr/lib/systemd/system/oech-server.service - -%postun -rm -rf /var/lock/oech.lock - -%changelog -* Sun Jul 01 2020 Cui XuCui - 1.0.0-2 -* Fri Jul 26 2019 Lu Tianxiong - 1.0.0-h1 -- Initial spec - +%define version 1.0.0 +%define release 3 +%define debug_package %{nil} +%global _build_id_links none +%undefine __brp_mangle_shebangs + +Name: oec-hardware +Summary: openEuler Hardware Compatibility Test Suite +Version: %{version} +Release: %{release} +Group: Development/Tools +License: Mulan PSL v2 +URL: https://gitee.com/openeuler/oec-hardware +Source0: %{name}-%{version}.tar.bz2 + +#PATCH-FIX-https://gitee.com/src-openEuler/ patch from oec-hardware project +Patch0001: oec-hardware-1.0.0-system.patch + +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: gcc +Requires: kernel-devel, kernel-headers, dmidecode, tar +Requires: qperf, fio, memtester +Requires: kernel >= 4 +Requires: python3 + +# server subpackage +%package server +Summary: openEuler Hardware Compatibility Test Server +Group: Development/Tools +Requires: python3, python3-devel, nginx, tar, qperf, psmisc + +%description +openEuler Hardware Compatibility Test Suite + +%description server +openEuler Hardware Compatibility Test Server + +%prep +%setup -q -c + +%build +[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +DESTDIR=$RPM_BUILD_ROOT VERSION_RELEASE=%{version} make + +%install +DESTDIR=$RPM_BUILD_ROOT make install + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; + +%pre + +%post + +%files +%defattr(-,root,root) +/usr/bin/oech +/usr/share/oech/kernelrelease.json +/usr/share/oech/lib/hwcompatible +/usr/share/oech/lib/tests +/usr/lib/systemd/system/oech.service +%dir /var/oech +%dir /usr/share/oech/lib +%dir /usr/share/oech + +%files server +%defattr(-,root,root) +/usr/share/oech/lib/server +/usr/share/oech/lib/server/uwsgi.ini +/usr/share/oech/lib/server/uwsgi.conf +/usr/lib/systemd/system/oech-server.service + +%postun +rm -rf /var/lock/oech.lock + +%changelog +* Sun Jul 18 2020 Cui XuCui - 1.0.0-3 +* Sun Jul 01 2020 Cui XuCui - 1.0.0-2 +* Fri Jul 26 2019 Lu Tianxiong - 1.0.0-h1 +- Initial spec +