diff --git a/0005-add-fpi_tail-param-for-grub.patch b/0005-add-fpi_tail-param-for-grub.patch new file mode 100644 index 0000000000000000000000000000000000000000..a2f5a4f527d65309275d8e02d7b7b54f2ca4750a --- /dev/null +++ b/0005-add-fpi_tail-param-for-grub.patch @@ -0,0 +1,71 @@ +From 3b813b13637065c76184f6e57d0fa76d2571b1ca Mon Sep 17 00:00:00 2001 +From: gitee-cmd +Date: Fri, 31 Dec 2021 15:11:32 +0800 +Subject: [PATCH] add fpi_tail param for grub + +--- + isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg | 8 ++++---- + isomaker/80-openeuler/config_files/x86/grub2-efi.cfg | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg +index 43b0e74..2d165e1 100644 +--- a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg ++++ b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg +@@ -27,20 +27,20 @@ search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### + menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ ro inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me ++ linux @KERNELPATH@ @ROOT@ ro inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off + initrd @INITRDPATH@ + } + menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ rd.live.check inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me ++ linux @KERNELPATH@ @ROOT@ rd.live.check inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off + initrd @INITRDPATH@ + } + submenu 'Troubleshooting -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ nomodeset inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me ++ linux @KERNELPATH@ @ROOT@ nomodeset inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off + initrd @INITRDPATH@ + } + menuentry 'Rescue the @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me ++ linux @KERNELPATH@ @ROOT@ rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off + initrd @INITRDPATH@ + } + } +diff --git a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg +index 5001156..fe2bc03 100644 +--- a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg ++++ b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg +@@ -21,20 +21,20 @@ search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### + menuentry 'Install @PRODUCT@ @VERSION@' --class openEuler --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ quiet ++ linuxefi @KERNELPATH@ @ROOT@ fpi_to_tail=off + initrdefi @INITRDPATH@ + } + menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class openEuler --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet ++ linuxefi @KERNELPATH@ @ROOT@ rd.live.check fpi_to_tail=off + initrdefi @INITRDPATH@ + } + submenu 'Troubleshooting -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class openEuler --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet ++ linuxefi @KERNELPATH@ @ROOT@ nomodeset fpi_to_tail=off + initrdefi @INITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class openEuler --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ rescue quiet ++ linuxefi @KERNELPATH@ @ROOT@ rescue fpi_to_tail=off + initrdefi @INITRDPATH@ + } + } +-- +2.27.0 + diff --git a/0006-support-usb-flash-drive-mode.patch b/0006-support-usb-flash-drive-mode.patch new file mode 100644 index 0000000000000000000000000000000000000000..fb7c8ed1284a180bc49b4a9d1436cecb810dbc03 --- /dev/null +++ b/0006-support-usb-flash-drive-mode.patch @@ -0,0 +1,40 @@ +From bb1688a8e8c8dc18ccd3c2ed778a0c5c0bd52633 Mon Sep 17 00:00:00 2001 +From: wangchong1995924 <15229716099@163.com> +Date: Wed, 26 Jan 2022 14:13:00 +0800 +Subject: [PATCH 1/1] support usb flash drive mode + +--- + isomaker/iso.sh | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/isomaker/iso.sh b/isomaker/iso.sh +index b15b394..379c538 100755 +--- a/isomaker/iso.sh ++++ b/isomaker/iso.sh +@@ -39,6 +39,7 @@ function gen_standard_iso() + if [ "$ARCH" == "x86_64" ]; then + mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 ++ isohybrid -u "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" + elif [ "$ARCH" == "aarch64" ]; then + mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 +@@ -75,6 +76,7 @@ function gen_everything_iso() + if [ "$ARCH" == "x86_64" ]; then + mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 ++ isohybrid -u /result/"${EVE_ISO_NAME}" + elif [ "$ARCH" == "aarch64" ]; then + mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 +@@ -126,6 +128,7 @@ function gen_netinst_iso() + if [ "$ARCH" == "x86_64" ]; then + mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${NETINST_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 ++ isohybrid -u /result/"${NETINST_ISO_NAME}" + elif [ "$ARCH" == "aarch64" ]; then + mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${NETINST_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + fi +-- +2.27.0 + diff --git a/0007-restore-env-after-selinux-status-changes.patch b/0007-restore-env-after-selinux-status-changes.patch new file mode 100644 index 0000000000000000000000000000000000000000..6133eb2b4d7dff3cc6495df3ba6345e637aa7d30 --- /dev/null +++ b/0007-restore-env-after-selinux-status-changes.patch @@ -0,0 +1,157 @@ +From f075bae9bb9f32c4559cb48f51dd83d42f581a79 Mon Sep 17 00:00:00 2001 +From: xyn-coder +Date: Tue, 8 Mar 2022 20:19:42 +0800 +Subject: [PATCH] restore env after selinux status changes + +--- + isomaker/env_record.sh | 49 +++++++++++++++++++++++++++++++++++++++++ + isomaker/env_restore.sh | 30 +++++++++++++++++++++++++ + isomaker/img_repo.sh | 3 +++ + isomaker/oemaker.sh | 9 +++++++- + 4 files changed, 90 insertions(+), 1 deletion(-) + create mode 100644 isomaker/env_record.sh + create mode 100644 isomaker/env_restore.sh + +diff --git a/isomaker/env_record.sh b/isomaker/env_record.sh +new file mode 100644 +index 0000000..f4ed024 +--- /dev/null ++++ b/isomaker/env_record.sh +@@ -0,0 +1,49 @@ ++:<> /etc/profile ++ fi ++ ++ echo "the current env has been recorded. " ++ echo "If oemaker run failed, run the following cmd restore current env" ++ echo "sh ${CPATH}/env_restore.sh" ++} ++ ++ ++function env_restore() ++{ ++ sh "${CPATH}"/env_restore.sh ++} +\ No newline at end of file +diff --git a/isomaker/env_restore.sh b/isomaker/env_restore.sh +new file mode 100644 +index 0000000..15f6311 +--- /dev/null ++++ b/isomaker/env_restore.sh +@@ -0,0 +1,30 @@ ++:<> /dev/null ++ if [ "$SELINUX_FLAG" -eq 0 ] || [ "$SELINUX_FLAG" -eq 1 ]; then ++ setenforce "${SELINUX_FLAG}" ++ else ++ echo "/etc/profile have no value: SELINUX_FLAG" ++ fi ++} ++ ++env_restore +diff --git a/isomaker/img_repo.sh b/isomaker/img_repo.sh +index 9135b39..5e956c7 100644 +--- a/isomaker/img_repo.sh ++++ b/isomaker/img_repo.sh +@@ -35,12 +35,15 @@ function create_install_img() + else + vertmp=${VERSION} + fi ++ ++ set +e + lorax --isfinal -p "${PRODUCT}" -v "${vertmp}" -r "${RELEASE}" -t "${VARIANT}" --sharedir 80-openeuler --rootfs-size=4 --buildarch="$ARCH" $(cat yumrepo.file) --nomacboot --noupgrade "${BUILD}"/iso > lorax.logfile 2>&1 + + if [ $? != 0 ] ; then + cat lorax.logfile + exit 1 + fi ++ set -e + } + + function create_repos() +diff --git a/isomaker/oemaker.sh b/isomaker/oemaker.sh +index c5d85fb..9fa8e08 100644 +--- a/isomaker/oemaker.sh ++++ b/isomaker/oemaker.sh +@@ -29,6 +29,7 @@ source "${CPATH}"/iso.sh + source "${CPATH}"/rpm.sh + source "${CPATH}"/img_repo.sh + source "${CPATH}"/make_debug.sh ++source "${CPATH}"/env_record.sh + + function mkclean() + { +@@ -156,8 +157,14 @@ function mk_oe_main() + return 0 + } + ++env_record ++ + mk_oe_main "$@" +-if [ $? -ne 0 ]; then ++main_ret="$?" ++ ++env_restore ++ ++if [ "$main_ret" -ne 0 ]; then + echo "make iso failed" + exit 1 + fi +-- +2.33.0 + diff --git a/0008-add-parse_everything_deb_exclude.patch b/0008-add-parse_everything_deb_exclude.patch new file mode 100644 index 0000000000000000000000000000000000000000..9d6090e6c9ec329419cc4de4288670787cc0773a --- /dev/null +++ b/0008-add-parse_everything_deb_exclude.patch @@ -0,0 +1,31 @@ +From efcc2fd150f9fe625a03b4b5d9c492f6691b1ba1 Mon Sep 17 00:00:00 2001 +From: small_leek +Date: Fri, 18 Mar 2022 11:19:07 +0800 +Subject: [PATCH] add parse_everything_deb_exclude + +--- + isomaker/rpm.sh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh +index e5fad1f..fa6167b 100644 +--- a/isomaker/rpm.sh ++++ b/isomaker/rpm.sh +@@ -217,6 +217,14 @@ function everything_debug_rpms_download() + { + mkdir ${EVERY_DEBUG_DIR} + yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo|debugsource" > ava_debug_lst ++ parse_rpmlist_xml "everything_debug_exclude" ++ cat parsed_rpmlist_everything_debug_exclude ++ if [ -s parsed_rpmlist_everything_debug_exclude ];then ++ for rpmname in $(cat parsed_rpmlist_everything_debug_exclude) ++ do ++ sed -i "/^${rpmname}\./d" ava_debug_lst ++ done ++ fi + yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_DEBUG_DIR}" $(cat ava_debug_lst | tr '\n' ' ') + if [ $? != 0 ] || [ $(ls ${EVERY_DEBUG_DIR} | wc -l) == 0 ]; then + echo "yumdownloader with --resolve failed, trying to yumdownloader without --resolve" +-- +2.27.0 + 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 10de58021452b225554e171b89e57843d5609b36..41c3a5f757957854616b9594eb16278433a3e182 100644 --- a/README.en.md +++ b/README.en.md @@ -64,5 +64,5 @@ isocut _[-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 -r extern rpm packages path - -k kickstart file path + -k Kickstart file path -h show the help message and exit diff --git a/README.md b/README.md index 244876a11a9349b771a9a530f79fe23d34b6ff46..31239438a284c94521c363e3c32d5da1fea019a1 100644 --- a/README.md +++ b/README.md @@ -65,5 +65,5 @@ isocut _[-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 -r extern rpm packages path - -k kickstart file 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 765624a08a6a03e4c096e2ddf6cd88110df70117..e0943dabb9c1dd88ed084e4fdf6825210d54c0d0 100644 --- a/normal_aarch64.xml +++ b/normal_aarch64.xml @@ -433,7 +433,6 @@ krb5-pkinit krb5-workstation luksmeta - nscd nss-pam-ldapd openldap-clients samba-winbind @@ -1011,7 +1010,6 @@ pcp-import-mrtg2pcp pcp-libs pcp-libs-devel - pcp-manager pcp-pmda-apache pcp-pmda-bash pcp-pmda-bonding @@ -1046,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 @@ -1064,7 +1060,6 @@ pcp-pmda-systemd pcp-pmda-trace pcp-pmda-unbound - pcp-pmda-vmware pcp-pmda-weblog pcp-pmda-zimbra pcp-pmda-zswap @@ -1072,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 0736c12135b5ed42bac1a6c756c8502ff7649d81..4d00bf08ac894da3700a8200876a3ff7a7ec856c 100644 --- a/normal_x86_64.xml +++ b/normal_x86_64.xml @@ -433,7 +433,6 @@ krb5-pkinit krb5-workstation luksmeta - nscd nss-pam-ldapd openldap-clients samba-winbind @@ -1013,7 +1012,6 @@ pcp-import-mrtg2pcp pcp-libs pcp-libs-devel - pcp-manager pcp-pmda-apache pcp-pmda-bash pcp-pmda-bonding @@ -1048,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 @@ -1066,7 +1062,6 @@ pcp-pmda-systemd pcp-pmda-trace pcp-pmda-unbound - pcp-pmda-vmware pcp-pmda-weblog pcp-pmda-zimbra pcp-pmda-zswap @@ -1074,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-2.0.0.tar.gz b/oemaker-2.0.0.tar.gz deleted file mode 100644 index 815e1067b95a4a30361b3bfd03ed8b72edfd4309..0000000000000000000000000000000000000000 Binary files a/oemaker-2.0.0.tar.gz and /dev/null differ diff --git a/oemaker-2.0.3.tar.gz b/oemaker-2.0.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1c01912cc4fce0bf11ad467d59ae9030584d0552 Binary files /dev/null and b/oemaker-2.0.3.tar.gz differ diff --git a/oemaker.spec b/oemaker.spec index 964a0ea701ba5f323c87b4a0aae723af94935283..0a34eef1c919af64669180228a3a9e2a4876ede9 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -10,8 +10,8 @@ Name: oemaker Summary: a duilding tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management -Version: 2.0.0 -Release: 13 +Version: 2.0.3 +Release: 14 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -28,6 +28,11 @@ Patch0001: 0001-rename-source-iso.patch Patch0002: 0002-bugfix-I3QY98.patch Patch0003: 0003-change-for-edge-computing.patch 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 +Patch0009: 0009-automated-kickstart-function.patch %description a building tool for DVD ISO making and ISO cutting @@ -73,6 +78,8 @@ install -m 700 %{name}/isomaker/img_repo.sh %{buildroot}/opt/oemaker/img_repo.sh install -m 700 %{name}/isomaker/init.sh %{buildroot}/opt/oemaker/init.sh install -m 700 %{name}/isomaker/iso.sh %{buildroot}/opt/oemaker/iso.sh install -m 700 %{name}/isomaker/rpm.sh %{buildroot}/opt/oemaker/rpm.sh +install -m 700 %{name}/isomaker/env_record.sh %{buildroot}/opt/oemaker/env_record.sh +install -m 700 %{name}/isomaker/env_restore.sh %{buildroot}/opt/oemaker/env_restore.sh install -m 400 %{name}/isomaker/config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml install -m 400 %{name}/isomaker/config/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/ install -m 400 %{name}/isomaker/config/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/ @@ -129,6 +136,61 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Wed Apr 20 2022 xiangyuning - 2.0.3-14 +- ID:NA +- SUG:NA +- DESC: restore the automated kickstart function + +* Thu Mar 31 2022 zhouwenpei - 2.0.3-13 +- ID:NA +- SUG:NA +- DESC: add linux-firmware subpackage + +* Mon Mar 28 2022 Senlin - 2.0.3-12 +- ID:NA +- SUG:NA +- DESC: add exclude list for everything + +* Mon Mar 7 2022 xiangyuning - 2.0.3-11 +- ID:NA +- SUG:NA +- DESC: modify restore env mode + +* Fri Mar 4 2022 xiangyuning - 2.0.3-10 +- ID:NA +- SUG:NA +- 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 Mar 2 2022 xiangyuning - 2.0.3-8 +- ID:NA +- SUG:NA +- DESC: restore env after selinux status changes + +* Wed Feb 23 2022 zhuyuncheng - 2.0.3-7 +- ID:NA +- SUG:NA +- DESC: add Server install mode and packages for edge computing iso + +* 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 + +* Mon Feb 14 2022 wangchong <952173335@qq.com> - 2.0.3-4 +- ID:NA +- SUG:NA +- 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 - SUG:NA diff --git a/rpmlist.xml b/rpmlist.xml index f9d1c66ac489d30bd82a3abfd34b87eb8676cbb2..639d74af0fae8b31a297f595ebd9b16a5d10394c 100644 --- a/rpmlist.xml +++ b/rpmlist.xml @@ -32,26 +32,41 @@ 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 + edk2-ovmf grub2-efi-x64 grub2-efi-x64-modules shim @@ -316,8 +331,6 @@ fuse-help fxload fxload-help - gamin - gamin-help gawk gawk-help gcc-gfortran @@ -480,8 +493,6 @@ krb5-server lapack lapack-devel - latrace - latrace-help lcr ldns ldns-help @@ -773,6 +784,14 @@ libyaml libyaml-help linux-firmware + linux-firmware-ath + linux-firmware-cypress + linux-firmware-iwlwifi + linux-firmware-libertas + linux-firmware-mediatek + linux-firmware-mrvl + linux-firmware-netronome + linux-firmware-ti-connectivity lm_sensors lm_sensors-devel lm_sensors-help @@ -886,7 +905,6 @@ notification-daemon notification-daemon-help npth - nscd nss nss-help nss-mdns @@ -915,8 +933,8 @@ open-iscsi open-iscsi-help open-isns-help - openjpeg-help - openjpeg-libs + openjpeg2 + openjpeg2-help openldap openldap-clients openldap-help @@ -1168,6 +1186,7 @@ rsyslog-mmsnmptrapd rsyslog-mysql rsyslog-snmp + rsyslog-gnutls rtkit rtkit-help samba-common-tools