diff --git a/0009-automated-kickstart-function.patch b/0009-automated-kickstart-function.patch new file mode 100644 index 0000000000000000000000000000000000000000..39bd4870c002cd1443febe68e5c0a6fb15070794 --- /dev/null +++ b/0009-automated-kickstart-function.patch @@ -0,0 +1,32 @@ +From 399955bd41020fc3de9528372c797714a4f7d6f5 Mon Sep 17 00:00:00 2001 +From: xyn-coder +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 + diff --git a/README.en.md b/README.en.md index 3ae898593b21279c2a7b8344aba81cc08e80dca9..41c3a5f757957854616b9594eb16278433a3e182 100644 --- a/README.en.md +++ b/README.en.md @@ -53,7 +53,7 @@ oemaker _[-h] [-t Type] [-p Product] [-v Version] [-r RELEA ##### isocut -isocut _[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_ +isocut _[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_ positional arguments: @@ -64,4 +64,5 @@ isocut _[-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 diff --git a/README.md b/README.md index 8efd9f2733fdc5f7ca438098c912a7fcf18793dc..31239438a284c94521c363e3c32d5da1fea019a1 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ oemaker _[-h] [-t Type] [-p Product] [-v Version] [-r RELEA ##### isocut -isocut _[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_ +isocut _[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_ positional arguments: @@ -65,4 +65,5 @@ isocut _[-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 diff --git a/edge_normal_aarch64.xml b/edge_normal_aarch64.xml index 8810540aae2a1d9121a08604a5854dc1c1f9cd86..8ce22fc20de0c546839e903450cc2f119e8372f2 100644 --- a/edge_normal_aarch64.xml +++ b/edge_normal_aarch64.xml @@ -102,6 +102,30 @@ chrony + + edge + Edge + 边缘场景 + Package for edge scene + 边缘场景相关包 + true + false + + kubernetes + kubernetes-client + kubernetes-help + kubernetes-kubeadm + kubernetes-kubelet + kubernetes-master + kubernetes-node + kubeedge-cloudcore + kubeedge-edgecore + kubeedge-edgesite + kubeedge-keadm + mdadm + mdadm-help + + minimal-environment Minimal Install @@ -116,4 +140,19 @@ standard + + edge-cloud-environment + Edge Cloud + 边缘云 + For edge computing scenarios + 用于边缘计算场景 + 2 + + core + edge + + + standard + + diff --git a/edge_normal_x86_64.xml b/edge_normal_x86_64.xml index a16592036c46a7aa3f4a6b7314e6782428fcd4f2..a7e64e1d003999079ce16a02a4e51e721e30d4c5 100644 --- a/edge_normal_x86_64.xml +++ b/edge_normal_x86_64.xml @@ -102,6 +102,30 @@ chrony + + edge + Edge + 边缘场景 + Package for edge scene + 边缘场景相关包 + true + false + + kubernetes + kubernetes-client + kubernetes-help + kubernetes-kubeadm + kubernetes-kubelet + kubernetes-master + kubernetes-node + kubeedge-cloudcore + kubeedge-edgecore + kubeedge-edgesite + kubeedge-keadm + mdadm + mdadm-help + + minimal-environment Minimal Install @@ -116,4 +140,19 @@ standard + + edge-cloud-environment + Edge Cloud + 边缘云 + For edge computing scenarios + 用于边缘计算场景 + 2 + + core + edge + + + standard + + diff --git a/normal_aarch64.xml b/normal_aarch64.xml index 10258506c69d0499a10ff83e3d0c0b1a538d2287..e0943dabb9c1dd88ed084e4fdf6825210d54c0d0 100644 --- a/normal_aarch64.xml +++ b/normal_aarch64.xml @@ -1010,7 +1010,6 @@ pcp-import-mrtg2pcp pcp-libs pcp-libs-devel - pcp-manager pcp-pmda-apache pcp-pmda-bash pcp-pmda-bonding @@ -1045,13 +1044,11 @@ pcp-pmda-nfsclient pcp-pmda-nvidia-gpu pcp-pmda-oracle - pcp-pmda-papi pcp-pmda-pdns pcp-pmda-perfevent pcp-pmda-prometheus pcp-pmda-redis pcp-pmda-roomtemp - pcp-pmda-rpm pcp-pmda-rsyslog pcp-pmda-samba pcp-pmda-sendmail @@ -1063,7 +1060,6 @@ pcp-pmda-systemd pcp-pmda-trace pcp-pmda-unbound - pcp-pmda-vmware pcp-pmda-weblog pcp-pmda-zimbra pcp-pmda-zswap @@ -1071,11 +1067,6 @@ pcp-system-tools pcp-testsuite pcp-webapi - pcp-webapp-blinkenlights - pcp-webapp-grafana - pcp-webapp-graphite - pcp-webapp-vector - pcp-webjs pcp-zeroconf perl-PCP-LogImport perl-PCP-LogSummary diff --git a/normal_x86_64.xml b/normal_x86_64.xml index 0802936b2af534a77fa70ab92e182c4a47b903af..4d00bf08ac894da3700a8200876a3ff7a7ec856c 100644 --- a/normal_x86_64.xml +++ b/normal_x86_64.xml @@ -1012,7 +1012,6 @@ pcp-import-mrtg2pcp pcp-libs pcp-libs-devel - pcp-manager pcp-pmda-apache pcp-pmda-bash pcp-pmda-bonding @@ -1047,13 +1046,11 @@ pcp-pmda-nfsclient pcp-pmda-nvidia-gpu pcp-pmda-oracle - pcp-pmda-papi pcp-pmda-pdns pcp-pmda-perfevent pcp-pmda-prometheus pcp-pmda-redis pcp-pmda-roomtemp - pcp-pmda-rpm pcp-pmda-rsyslog pcp-pmda-samba pcp-pmda-sendmail @@ -1065,7 +1062,6 @@ pcp-pmda-systemd pcp-pmda-trace pcp-pmda-unbound - pcp-pmda-vmware pcp-pmda-weblog pcp-pmda-zimbra pcp-pmda-zswap @@ -1073,11 +1069,6 @@ pcp-system-tools pcp-testsuite pcp-webapi - pcp-webapp-blinkenlights - pcp-webapp-grafana - pcp-webapp-graphite - pcp-webapp-vector - pcp-webjs pcp-zeroconf perl-PCP-LogImport perl-PCP-LogSummary diff --git a/oemaker.spec b/oemaker.spec index ddf96859695b35d653bcf23c92663f1d8322281c..0a34eef1c919af64669180228a3a9e2a4876ede9 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -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 - 2.0.3-14 +* Wed Apr 20 2022 xiangyuning - 2.0.3-14 - ID:NA - SUG:NA -- DESC:add openjpeg2 +- DESC: restore the automated kickstart function -* Thu Apr 14 2022 zhouwenpei - 2.0.3-13 +* Thu Mar 31 2022 zhouwenpei - 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 - 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 - 2.0.0-19 +* Mon Mar 7 2022 xiangyuning - 2.0.3-11 - ID:NA - SUG:NA -- DESC: add edk2-ovmf package +- DESC: modify restore env mode -* Tue Feb 22 2022 jiangheng - 2.0.0-18 +* Fri Mar 4 2022 xiangyuning - 2.0.3-10 - ID:NA - SUG:NA -- DESC: delete nscd package +- DESC: lorax cmd add printed log + +* Fri Mar 4 2022 xiangyuning - 2.0.3-9 +- ID:NA +- SUG:NA +- DESC: fix build oemaker failed issue -* Wed Feb 16 2022 tianwei - 2.0.0-17 +* Wed Mar 2 2022 xiangyuning - 2.0.3-8 - ID:NA - SUG:NA -- DESC: delete latrace package +- DESC: restore env after selinux status changes -* Mon Feb 14 2022 wangchong <952173335@qq.com> - 2.0.0-16 +* Wed Feb 23 2022 zhuyuncheng - 2.0.3-7 - ID:NA - SUG:NA -- DESC: support usb flash drive mode +- DESC: add Server install mode and packages for edge computing iso -* Thu Feb 10 2022 hanhui15 - 2.0.0-15 -- DESC:delete decay packages, gamin and openjpeg +* Wed Feb 23 2022 hanhui - 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 - 2.0.3-5 +- ID:NA +- SUG:NA +- DESC: delete nscd package -* Wed Feb 9 2022 wuchaochao - 2.0.0-14 +* Mon Feb 14 2022 wangchong <952173335@qq.com> - 2.0.3-4 - 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 diff --git a/rpmlist.xml b/rpmlist.xml index 944bbd95ec77d1461d615c39e7d374a0f6ab9804..639d74af0fae8b31a297f595ebd9b16a5d10394c 100644 --- a/rpmlist.xml +++ b/rpmlist.xml @@ -32,21 +32,35 @@ texlive-scheme-gust texlive-scheme-medium texlive-scheme-tetex - python3-nni + drbd + drbd-bash-completion + drbd-pacemaker + drbd-rgmanager + drbd-udev + drbd-utils + gnome-boxes + nodejs-grunt-contrib-watch - totem - gimp + drbd + gnome-boxes + nodejs-grunt-contrib-watch + + + drbd-debuginfo + drbd-debugsource + gnome-boxes-debuginfo + gnome-boxes-debugsource edk2-aarch64 grub2-efi-aa64 grub2-efi-aa64-modules hisi_hpre - hisi_rde + hisi_trng_v2 hisi_sec2 hisi_zip - libkae + uadk_engine libwd shim-aa64 uacce @@ -919,8 +933,8 @@ open-iscsi open-iscsi-help open-isns-help - openjpeg2-help openjpeg2 + openjpeg2-help openldap openldap-clients openldap-help @@ -1172,7 +1186,7 @@ rsyslog-mmsnmptrapd rsyslog-mysql rsyslog-snmp - rsyslog-gnutls + rsyslog-gnutls rtkit rtkit-help samba-common-tools