Merge branch 'master' of gitee.com:src-openeuler/oemaker into master

This commit is contained in:
zhouwenpei 2022-04-14 06:31:33 +00:00 committed by Gitee
commit 292c0dced5
4 changed files with 10 additions and 6 deletions

View File

@ -53,7 +53,7 @@ oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEA
##### isocut ##### isocut
isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_</font> isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_</font>
positional arguments: positional arguments:
@ -64,5 +64,4 @@ isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k k
-t the temporary path which must be an absolute path and must be greater than 8g -t the temporary path which must be an absolute path and must be greater than 8g
-r extern rpm packages path -r extern rpm packages path
-k kickstart file path
-h show the help message and exit -h show the help message and exit

View File

@ -54,7 +54,7 @@ oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEA
##### isocut ##### isocut
isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_</font> isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_</font>
positional arguments: positional arguments:
@ -65,5 +65,4 @@ isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k k
-t the temporary path which must be an absolute path and must be greater than 8g -t the temporary path which must be an absolute path and must be greater than 8g
-r extern rpm packages path -r extern rpm packages path
-k kickstart file path
-h show the help message and exit -h show the help message and exit

View File

@ -11,7 +11,7 @@ Summary: a duilding tool for DVD ISO making and ISO cutting
License: Mulan PSL v2 License: Mulan PSL v2
Group: System/Management Group: System/Management
Version: 2.0.0 Version: 2.0.0
Release: 15 Release: 16
BuildRoot: %{_tmppath}/%{name} BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@ -130,11 +130,16 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name} rm -rf $RPM_BUILD_DIR/%{name}
%changelog %changelog
* Fri Apr 01 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.0.3-15 * Thu Apr 14 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.0.3-16
- ID:NA - ID:NA
- SUG:NA - SUG:NA
- DESC: add linux-firmware subpackage - DESC: add linux-firmware subpackage
* Thu Mar 24 2022 wuchaochao <cyanrose@yeah.net> - 2.0.0-15
- ID:NA
- SUG:NA
- DESC: add rsyslog-gnutls package
* Tue Feb 22 2022 jiangheng <jiangheng12@huawei.com> - 2.0.0-14 * Tue Feb 22 2022 jiangheng <jiangheng12@huawei.com> - 2.0.0-14
- ID:NA - ID:NA
- SUG:NA - SUG:NA

View File

@ -1200,6 +1200,7 @@
<packagereq>rsyslog-mmsnmptrapd</packagereq> <packagereq>rsyslog-mmsnmptrapd</packagereq>
<packagereq>rsyslog-mysql</packagereq> <packagereq>rsyslog-mysql</packagereq>
<packagereq>rsyslog-snmp</packagereq> <packagereq>rsyslog-snmp</packagereq>
<packagereq>rsyslog-gnutls</packagereq>
<packagereq>rtkit</packagereq> <packagereq>rtkit</packagereq>
<packagereq>rtkit-help</packagereq> <packagereq>rtkit-help</packagereq>
<packagereq>samba-common-tools</packagereq> <packagereq>samba-common-tools</packagereq>