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/normal_aarch64.xml b/normal_aarch64.xml index 765624a08a6a03e4c096e2ddf6cd88110df70117..ad508eef6d5d8ddaa7dd31cb986addabb23ea1d9 100644 --- a/normal_aarch64.xml +++ b/normal_aarch64.xml @@ -1011,7 +1011,6 @@ pcp-import-mrtg2pcp pcp-libs pcp-libs-devel - pcp-manager pcp-pmda-apache pcp-pmda-bash pcp-pmda-bonding @@ -1046,13 +1045,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 +1061,6 @@ pcp-pmda-systemd pcp-pmda-trace pcp-pmda-unbound - pcp-pmda-vmware pcp-pmda-weblog pcp-pmda-zimbra pcp-pmda-zswap @@ -1072,11 +1068,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..5e6b5cbfa68ea3b9e5aeaf94731a23bd3470e1b4 100644 --- a/normal_x86_64.xml +++ b/normal_x86_64.xml @@ -1013,7 +1013,6 @@ pcp-import-mrtg2pcp pcp-libs pcp-libs-devel - pcp-manager pcp-pmda-apache pcp-pmda-bash pcp-pmda-bonding @@ -1048,13 +1047,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 +1063,6 @@ pcp-pmda-systemd pcp-pmda-trace pcp-pmda-unbound - pcp-pmda-vmware pcp-pmda-weblog pcp-pmda-zimbra pcp-pmda-zswap @@ -1074,11 +1070,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..9e7f57b043e179e04373e00c5f2537260d33432d 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: 4 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -28,6 +28,8 @@ 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 %description a building tool for DVD ISO making and ISO cutting @@ -129,6 +131,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* 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..935cb3d25fee57af50ac26cf1d060e0bee624dd8 100644 --- a/rpmlist.xml +++ b/rpmlist.xml @@ -480,8 +480,6 @@ krb5-server lapack lapack-devel - latrace - latrace-help lcr ldns ldns-help