packages/oemaker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!167 merging by 22.03-LTS

Browse Source 
From: @xyncoder 
Reviewed-by: @zhuchunyi, @xinsheng3 
Signed-off-by: @zhuchunyi
This commit is contained in:
openeuler-ci-bot 2022-05-19 12:25:58 +00:00 committed by Gitee
commit e7cf1f697a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 173 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0009-automated-kickstart-function.patch Normal file
View File

@ -0,0 +1,32 @@
From 399955bd41020fc3de9528372c797714a4f7d6f5 Mon Sep 17 00:00:00 2001
From: xyn-coder <xiangyuninig@huawei.com>
Date: Wed, 20 Apr 2022 15:34:08 +0800
Subject: [PATCH] automated kickstart function
---
isocut/isocut.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/isocut/isocut.py b/isocut/isocut.py
index fb6ab4a..75dc45d 100755
--- a/isocut/isocut.py
+++ b/isocut/isocut.py
@@ -138,13 +138,14 @@ def check_input():
parser.add_argument("dest_iso", help="destination iso image")
parser.add_argument("-t", metavar="temporary_path", default="/tmp", help="temporary path")
parser.add_argument("-r", metavar="rpm_path", help="extern rpm packages path")
+ parser.add_argument("-k", metavar="file_path", help="kickstart file")
args = parser.parse_args()
ICONFIG.src_iso = args.source_iso
ICONFIG.dest_iso = args.dest_iso
ICONFIG.temp_path = args.t
ICONFIG.rpm_path = args.r
- ICONFIG.ks_file = None
+ ICONFIG.ks_file = args.k
if ICONFIG.src_iso is None or ICONFIG.dest_iso is None:
print("Must specify source iso image and destination iso image")
--
2.33.0

3
README.en.md
View File

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

3
README.md
View File

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

39
edge_normal_aarch64.xml
View File

@ -102,6 +102,30 @@
<packagereq type="optional">chrony</packagereq>
</packagelist>
</group>
<group>
<id>edge</id>
<name>Edge</name>
<name xml:lang="zh_CN">边缘场景</name>
<description>Package for edge scene</description>
<description xml:lang="zh_CN">边缘场景相关包</description>
<default>true</default>
<uservisible>false</uservisible>
<packagelist>
<packagereq type="default">kubernetes</packagereq>
<packagereq type="default">kubernetes-client</packagereq>
<packagereq type="default">kubernetes-help</packagereq>
<packagereq type="default">kubernetes-kubeadm</packagereq>
<packagereq type="default">kubernetes-kubelet</packagereq>
<packagereq type="default">kubernetes-master</packagereq>
<packagereq type="default">kubernetes-node</packagereq>
<packagereq type="default">kubeedge-cloudcore</packagereq>
<packagereq type="default">kubeedge-edgecore</packagereq>
<packagereq type="default">kubeedge-edgesite</packagereq>
<packagereq type="default">kubeedge-keadm</packagereq>
<packagereq type="default">mdadm</packagereq>
<packagereq type="default">mdadm-help</packagereq>
</packagelist>
</group>
<environment>
<id>minimal-environment</id>
<name>Minimal Install</name>
@ -116,4 +140,19 @@
<groupid>standard</groupid>
</optionlist>
</environment>
<environment>
<id>edge-cloud-environment</id>
<name>Edge Cloud</name>
<name xml:lang="zh_CN">边缘云</name>
<description>For edge computing scenarios</description>
<description xml:lang="zh_CN">用于边缘计算场景</description>
<display_order>2</display_order>
<grouplist>
<groupid>core</groupid>
<groupid>edge</groupid>
</grouplist>
<optionlist>
<groupid>standard</groupid>
</optionlist>
</environment>
</comps>

39
edge_normal_x86_64.xml
View File

@ -102,6 +102,30 @@
<packagereq type="optional">chrony</packagereq>
</packagelist>
</group>
<group>
<id>edge</id>
<name>Edge</name>
<name xml:lang="zh_CN">边缘场景</name>
<description>Package for edge scene</description>
<description xml:lang="zh_CN">边缘场景相关包</description>
<default>true</default>
<uservisible>false</uservisible>
<packagelist>
<packagereq type="default">kubernetes</packagereq>
<packagereq type="default">kubernetes-client</packagereq>
<packagereq type="default">kubernetes-help</packagereq>
<packagereq type="default">kubernetes-kubeadm</packagereq>
<packagereq type="default">kubernetes-kubelet</packagereq>
<packagereq type="default">kubernetes-master</packagereq>
<packagereq type="default">kubernetes-node</packagereq>
<packagereq type="default">kubeedge-cloudcore</packagereq>
<packagereq type="default">kubeedge-edgecore</packagereq>
<packagereq type="default">kubeedge-edgesite</packagereq>
<packagereq type="default">kubeedge-keadm</packagereq>
<packagereq type="default">mdadm</packagereq>
<packagereq type="default">mdadm-help</packagereq>
</packagelist>
</group>
<environment>
<id>minimal-environment</id>
<name>Minimal Install</name>
@ -116,4 +140,19 @@
<groupid>standard</groupid>
</optionlist>
</environment>
<environment>
<id>edge-cloud-environment</id>
<name>Edge Cloud</name>
<name xml:lang="zh_CN">边缘云</name>
<description>For edge computing scenarios</description>
<description xml:lang="zh_CN">用于边缘计算场景</description>
<display_order>2</display_order>
<grouplist>
<groupid>core</groupid>
<groupid>edge</groupid>
</grouplist>
<optionlist>
<groupid>standard</groupid>
</optionlist>
</environment>
</comps>

9
normal_aarch64.xml
View File

@ -1010,7 +1010,6 @@
<packagereq type="default">pcp-import-mrtg2pcp</packagereq>
<packagereq type="default">pcp-libs</packagereq>
<packagereq type="default">pcp-libs-devel</packagereq>
<packagereq type="default">pcp-manager</packagereq>
<packagereq type="default">pcp-pmda-apache</packagereq>
<packagereq type="default">pcp-pmda-bash</packagereq>
<packagereq type="default">pcp-pmda-bonding</packagereq>
@ -1045,13 +1044,11 @@
<packagereq type="default">pcp-pmda-nfsclient</packagereq>
<packagereq type="default">pcp-pmda-nvidia-gpu</packagereq>
<packagereq type="default">pcp-pmda-oracle</packagereq>
<packagereq type="default">pcp-pmda-papi</packagereq>
<packagereq type="default">pcp-pmda-pdns</packagereq>
<packagereq type="default">pcp-pmda-perfevent</packagereq>
<packagereq type="default">pcp-pmda-prometheus</packagereq>
<packagereq type="default">pcp-pmda-redis</packagereq>
<packagereq type="default">pcp-pmda-roomtemp</packagereq>
<packagereq type="default">pcp-pmda-rpm</packagereq>
<packagereq type="default">pcp-pmda-rsyslog</packagereq>
<packagereq type="default">pcp-pmda-samba</packagereq>
<packagereq type="default">pcp-pmda-sendmail</packagereq>
@ -1063,7 +1060,6 @@
<packagereq type="default">pcp-pmda-systemd</packagereq>
<packagereq type="default">pcp-pmda-trace</packagereq>
<packagereq type="default">pcp-pmda-unbound</packagereq>
<packagereq type="default">pcp-pmda-vmware</packagereq>
<packagereq type="default">pcp-pmda-weblog</packagereq>
<packagereq type="default">pcp-pmda-zimbra</packagereq>
<packagereq type="default">pcp-pmda-zswap</packagereq>
@ -1071,11 +1067,6 @@
<packagereq type="default">pcp-system-tools</packagereq>
<packagereq type="default">pcp-testsuite</packagereq>
<packagereq type="default">pcp-webapi</packagereq>
<packagereq type="default">pcp-webapp-blinkenlights</packagereq>
<packagereq type="default">pcp-webapp-grafana</packagereq>
<packagereq type="default">pcp-webapp-graphite</packagereq>
<packagereq type="default">pcp-webapp-vector</packagereq>
<packagereq type="default">pcp-webjs</packagereq>
<packagereq type="default">pcp-zeroconf</packagereq>
<packagereq type="default">perl-PCP-LogImport</packagereq>
<packagereq type="default">perl-PCP-LogSummary</packagereq>

9
normal_x86_64.xml
View File

@ -1012,7 +1012,6 @@
<packagereq type="default">pcp-import-mrtg2pcp</packagereq>
<packagereq type="default">pcp-libs</packagereq>
<packagereq type="default">pcp-libs-devel</packagereq>
<packagereq type="default">pcp-manager</packagereq>
<packagereq type="default">pcp-pmda-apache</packagereq>
<packagereq type="default">pcp-pmda-bash</packagereq>
<packagereq type="default">pcp-pmda-bonding</packagereq>
@ -1047,13 +1046,11 @@
<packagereq type="default">pcp-pmda-nfsclient</packagereq>
<packagereq type="default">pcp-pmda-nvidia-gpu</packagereq>
<packagereq type="default">pcp-pmda-oracle</packagereq>
<packagereq type="default">pcp-pmda-papi</packagereq>
<packagereq type="default">pcp-pmda-pdns</packagereq>
<packagereq type="default">pcp-pmda-perfevent</packagereq>
<packagereq type="default">pcp-pmda-prometheus</packagereq>
<packagereq type="default">pcp-pmda-redis</packagereq>
<packagereq type="default">pcp-pmda-roomtemp</packagereq>
<packagereq type="default">pcp-pmda-rpm</packagereq>
<packagereq type="default">pcp-pmda-rsyslog</packagereq>
<packagereq type="default">pcp-pmda-samba</packagereq>
<packagereq type="default">pcp-pmda-sendmail</packagereq>
@ -1065,7 +1062,6 @@
<packagereq type="default">pcp-pmda-systemd</packagereq>
<packagereq type="default">pcp-pmda-trace</packagereq>
<packagereq type="default">pcp-pmda-unbound</packagereq>
<packagereq type="default">pcp-pmda-vmware</packagereq>
<packagereq type="default">pcp-pmda-weblog</packagereq>
<packagereq type="default">pcp-pmda-zimbra</packagereq>
<packagereq type="default">pcp-pmda-zswap</packagereq>
@ -1073,11 +1069,6 @@
<packagereq type="default">pcp-system-tools</packagereq>
<packagereq type="default">pcp-testsuite</packagereq>
<packagereq type="default">pcp-webapi</packagereq>
<packagereq type="default">pcp-webapp-blinkenlights</packagereq>
<packagereq type="default">pcp-webapp-grafana</packagereq>
<packagereq type="default">pcp-webapp-graphite</packagereq>
<packagereq type="default">pcp-webapp-vector</packagereq>
<packagereq type="default">pcp-webjs</packagereq>
<packagereq type="default">pcp-zeroconf</packagereq>
<packagereq type="default">perl-PCP-LogImport</packagereq>
<packagereq type="default">perl-PCP-LogSummary</packagereq>

63
oemaker.spec
View File

@ -31,7 +31,8 @@ Patch0004: 0004-bugfix-I3OGUT.patch
Patch0005: 0005-add-fpi_tail-param-for-grub.patch
Patch0006: 0006-support-usb-flash-drive-mode.patch
Patch0007: 0007-restore-env-after-selinux-status-changes.patch
Patch0008: 0008-add-parse_everything_deb_exclude.patch
Patch0008: 0008-add-parse_everything_deb_exclude.patch
Patch0009: 0009-automated-kickstart-function.patch
%description
a building tool for DVD ISO making and ISO cutting
@ -135,48 +136,60 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
* Thu Apr 28 2022 hanhui <hanhui15@h-partners.com> - 2.0.3-14
* Wed Apr 20 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-14
- ID:NA
- SUG:NA
- DESC:add openjpeg2
- DESC: restore the automated kickstart function
* Thu Apr 14 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.0.3-13
* Thu Mar 31 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.0.3-13
- ID:NA
- SUG:NA
- DESC:add linux-firmware subpackage
- DESC: add linux-firmware subpackage
* Wed Mar 30 2022 wangchong <952173335@qq.com> - 2.0.3-12
* Mon Mar 28 2022 Senlin <xiasenlin1@huawei.com> - 2.0.3-12
- ID:NA
- SUG:NA
- DESC: upgrade, keep up with openEuler-22.03-LTS
- DESC: add exclude list for everything
* Wed Feb 23 2022 imxcc <xingchaochao@huawei.com> - 2.0.0-19
* Mon Mar 7 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-11
- ID:NA
- SUG:NA
- DESC: add edk2-ovmf package
- DESC: modify restore env mode
* Tue Feb 22 2022 jiangheng <jiangheng12@huawei.com> - 2.0.0-18
* Fri Mar 4 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-10
- ID:NA
- SUG:NA
- DESC: lorax cmd add printed log
* Fri Mar 4 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-9
- ID:NA
- SUG:NA
- DESC: fix build oemaker failed issue
* Wed Mar 2 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-8
- ID:NA
- SUG:NA
- DESC: restore env after selinux status changes
* Wed Feb 23 2022 zhuyuncheng <zhuyuncheng@huawei.com> - 2.0.3-7
- ID:NA
- SUG:NA
- DESC: add Server install mode and packages for edge computing iso
* Wed Feb 23 2022 hanhui <hanhui15@h-partners.com> - 2.0.3-6
- DESC: delete gamin and openjpeg
add rsyslog-gnutls and edk2-ovmf packages
rename hisi_rde to hisi_trng_v2,libkae to uadk_engine
* Tue Feb 22 2022 jiangheng <jiangheng12@huawei.com> - 2.0.3-5
- ID:NA
- SUG:NA
- DESC: delete nscd package
* Wed Feb 16 2022 tianwei <tianwei12@h-partners.com> - 2.0.0-17
* Mon Feb 14 2022 wangchong <952173335@qq.com> - 2.0.3-4
- ID:NA
- SUG:NA
- DESC: delete latrace package
* Mon Feb 14 2022 wangchong <952173335@qq.com> - 2.0.0-16
- ID:NA
- SUG:NA
- DESC: support usb flash drive mode
* Thu Feb 10 2022 hanhui15 <hanhui@h-partners> - 2.0.0-15
- DESC:delete decay packages, gamin and openjpeg
* Wed Feb 9 2022 wuchaochao <cyanrose@yeah.net> - 2.0.0-14
- ID:NA
- SUG:NA
- DESC: add rsyslog-gnutls package
- DESC: upgrade to 2.0.3 and support usb flash drive mode and delete some packages
* Fri Jan 21 2022 zhang_xubo <2578876417@qq.com> - 2.0.0-13
- ID:NA

28
rpmlist.xml
View File

@ -32,21 +32,35 @@
<packagereq>texlive-scheme-gust</packagereq>
<packagereq>texlive-scheme-medium</packagereq>
<packagereq>texlive-scheme-tetex</packagereq>
<packagereq>python3-nni</packagereq>
<packagereq>drbd</packagereq>
<packagereq>drbd-bash-completion</packagereq>
<packagereq>drbd-pacemaker</packagereq>
<packagereq>drbd-rgmanager</packagereq>
<packagereq>drbd-udev</packagereq>
<packagereq>drbd-utils</packagereq>
<packagereq>gnome-boxes</packagereq>
<packagereq>nodejs-grunt-contrib-watch</packagereq>
</packagelist>
<packagelist type="src_exclude">
<packagereq>totem</packagereq>
<packagereq>gimp</packagereq>
<packagereq>drbd</packagereq>
<packagereq>gnome-boxes</packagereq>
<packagereq>nodejs-grunt-contrib-watch</packagereq>
</packagelist>
<packagelist type="everything_debug_exclude">
<packagereq>drbd-debuginfo</packagereq>
<packagereq>drbd-debugsource</packagereq>
<packagereq>gnome-boxes-debuginfo</packagereq>
<packagereq>gnome-boxes-debugsource</packagereq>
</packagelist>
<packagelist type="aarch64">
<packagereq>edk2-aarch64</packagereq>
<packagereq>grub2-efi-aa64</packagereq>
<packagereq>grub2-efi-aa64-modules</packagereq>
<packagereq>hisi_hpre</packagereq>
<packagereq>hisi_rde</packagereq>
<packagereq>hisi_trng_v2</packagereq>
<packagereq>hisi_sec2</packagereq>
<packagereq>hisi_zip</packagereq>
<packagereq>libkae</packagereq>
<packagereq>uadk_engine</packagereq>
<packagereq>libwd</packagereq>
<packagereq>shim-aa64</packagereq>
<packagereq>uacce</packagereq>
@ -919,8 +933,8 @@
<packagereq>open-iscsi</packagereq>
<packagereq>open-iscsi-help</packagereq>
<packagereq>open-isns-help</packagereq>
<packagereq>openjpeg2-help</packagereq>
<packagereq>openjpeg2</packagereq>
<packagereq>openjpeg2-help</packagereq>
<packagereq>openldap</packagereq>
<packagereq>openldap-clients</packagereq>
<packagereq>openldap-help</packagereq>
@ -1172,7 +1186,7 @@
<packagereq>rsyslog-mmsnmptrapd</packagereq>
<packagereq>rsyslog-mysql</packagereq>
<packagereq>rsyslog-snmp</packagereq>
<packagereq>rsyslog-gnutls</packagereq>
<packagereq>rsyslog-gnutls</packagereq>
<packagereq>rtkit</packagereq>
<packagereq>rtkit-help</packagereq>
<packagereq>samba-common-tools</packagereq>