packages/oec-hardware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update kernel file modification scope

Browse Source
This commit is contained in:
root 2020-07-18 09:58:53 +08:00
parent f5320b9e50
commit eaa060f437
2 changed files with 87 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oec-hardware-1.0.0-system.patch Normal file
View File

@ -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:

158
oec-hardware.spec
View File

@ -1,77 +1,81 @@
%define version 1.0.0 %define version 1.0.0
%define release 2 %define release 3
%define debug_package %{nil} %define debug_package %{nil}
%global _build_id_links none %global _build_id_links none
%undefine __brp_mangle_shebangs %undefine __brp_mangle_shebangs
Name: oec-hardware Name: oec-hardware
Summary: openEuler Hardware Compatibility Test Suite Summary: openEuler Hardware Compatibility Test Suite
Version: %{version} Version: %{version}
Release: %{release} Release: %{release}
Group: Development/Tools Group: Development/Tools
License: Mulan PSL v2 License: Mulan PSL v2
URL: https://gitee.com/openeuler/oec-hardware URL: https://gitee.com/openeuler/oec-hardware
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Buildroot: %{_tmppath}/%{name}-%{version}-root #PATCH-FIX-https://gitee.com/src-openEuler/ patch from oec-hardware project
BuildRequires: gcc Patch0001: oec-hardware-1.0.0-system.patch
Requires: kernel-devel, kernel-headers, dmidecode, tar
Requires: qperf, fio, memtester Buildroot: %{_tmppath}/%{name}-%{version}-root
Requires: kernel >= 4 BuildRequires: gcc
Requires: python3 Requires: kernel-devel, kernel-headers, dmidecode, tar
Requires: qperf, fio, memtester
# server subpackage Requires: kernel >= 4
%package server Requires: python3
Summary: openEuler Hardware Compatibility Test Server
Group: Development/Tools # server subpackage
Requires: python3, python3-devel, nginx, tar, qperf, psmisc %package server
Summary: openEuler Hardware Compatibility Test Server
%description Group: Development/Tools
openEuler Hardware Compatibility Test Suite Requires: python3, python3-devel, nginx, tar, qperf, psmisc
%description server %description
openEuler Hardware Compatibility Test Server openEuler Hardware Compatibility Test Suite
%prep %description server
%setup -q -c openEuler Hardware Compatibility Test Server
%build %prep
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; %setup -q -c
DESTDIR=$RPM_BUILD_ROOT VERSION_RELEASE=%{version} make
%build
%install [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT VERSION_RELEASE=%{version} make
%clean %install
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; DESTDIR=$RPM_BUILD_ROOT make install
%pre %clean
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
%post
%pre
%files
%defattr(-,root,root) %post
/usr/bin/oech
/usr/share/oech/kernelrelease.json %files
/usr/share/oech/lib/hwcompatible %defattr(-,root,root)
/usr/share/oech/lib/tests /usr/bin/oech
/usr/lib/systemd/system/oech.service /usr/share/oech/kernelrelease.json
%dir /var/oech /usr/share/oech/lib/hwcompatible
%dir /usr/share/oech/lib /usr/share/oech/lib/tests
%dir /usr/share/oech /usr/lib/systemd/system/oech.service
%dir /var/oech
%files server %dir /usr/share/oech/lib
%defattr(-,root,root) %dir /usr/share/oech
/usr/share/oech/lib/server
/usr/share/oech/lib/server/uwsgi.ini %files server
/usr/share/oech/lib/server/uwsgi.conf %defattr(-,root,root)
/usr/lib/systemd/system/oech-server.service /usr/share/oech/lib/server
/usr/share/oech/lib/server/uwsgi.ini
%postun /usr/share/oech/lib/server/uwsgi.conf
rm -rf /var/lock/oech.lock /usr/lib/systemd/system/oech-server.service
%changelog %postun
* Sun Jul 01 2020 Cui XuCui <cuixucui@huawei.com> - 1.0.0-2 rm -rf /var/lock/oech.lock
* Fri Jul 26 2019 Lu Tianxiong <lutianxiong@huawei.com> - 1.0.0-h1
- Initial spec %changelog
* Sun Jul 18 2020 Cui XuCui <cuixucui@huawei.com> - 1.0.0-3
* Sun Jul 01 2020 Cui XuCui <cuixucui@huawei.com> - 1.0.0-2
* Fri Jul 26 2019 Lu Tianxiong <lutianxiong@huawei.com> - 1.0.0-h1
- Initial spec