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/oemaker.spec b/oemaker.spec index 992835c138f96beec9c8ab17848ddf19e8d326f2..5c1647b36d28626364c4b9f6e4ccbdf81ae848b6 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -11,7 +11,7 @@ Summary: a duilding tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 2.0.3 -Release: 2 +Release: 3 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -29,6 +29,8 @@ 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 +* Sun Jan 30 2022 wang chong <952173335@qq.com> - 2.0.3-3 +- ID:NA +- SUG:NA +- DESC: support usb flash drive mode + * Tue Dec 28 2021 chemingdao - 2.0.3-2 - ID:NA - SUG:NA