diff --git a/0004-support-usb-flash-drive-mode.patch b/0004-support-usb-flash-drive-mode.patch new file mode 100644 index 0000000000000000000000000000000000000000..102b57157118bd2ddef6f2b5ed9c53d26fc2bfdc --- /dev/null +++ b/0004-support-usb-flash-drive-mode.patch @@ -0,0 +1,37 @@ +From 94309b3427555aa70207ef623e990f7bbdb1cb63 Mon Sep 17 00:00:00 2001 +From: wangchong1995924 <15229716099@163.com> +Date: Sun, 30 Jan 2022 14:48:00 +0800 +Subject: [PATCH] support usb flash drive mode + + +diff --git a/iso.sh b/iso.sh +index b15b394..379c538 100755 +--- a/iso.sh ++++ b/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.30.0 + diff --git a/oemaker.spec b/oemaker.spec index 35c6bbb867e8bb6994c9152b68b53fa66c8df675..bf8624a61f7d708099fa371b4ab2a482541c3faa 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -3,7 +3,7 @@ Summary: a duilding tool for making DVD ISO License: Mulan PSL v2 Group: System/Management Version: 1.1.2 -Release: 4 +Release: 5 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch @@ -13,6 +13,7 @@ Requires: lorax >= 19.6.78-1 Patch0001: 0001-change-source-iso-method.patch Patch0002: 0002-bug-fix-I3B7CH.patch Patch0003: 0003-delete-firefox-from-xml-file-of-x86_64.patch +Patch0004: 0004-support-usb-flash-drive-mode.patch %description a building tool for making DVD ISO @@ -68,6 +69,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Sun Jan 30 2022 wang chong <952173335@qq.com> - 1.1.2-5 +- ID:NA +- SUG:NA +- DESC: support usb flash drive mode + * Mon Mar 15 2021 miao_kaibo - 1.1.2-4 - ID:NA - SUG:NA