packages/oemaker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!117 support usb flash drive mode

Browse Source 
From: @wangchong1995924 
Reviewed-by: @overweight 
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2022-02-14 11:26:22 +00:00 committed by Gitee
commit 8154840cfd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0005-support-usb-flash-drive-mode.patch Normal file
View File

@ -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

8
oemaker.spec
View File

@ -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.0
Release: 12
Release: 13
BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@ -28,6 +28,7 @@ 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-support-usb-flash-drive-mode.patch
%description
a building tool for DVD ISO making and ISO cutting
@ -129,6 +130,11 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
* Mon Feb 14 2022 wangchong <952173335@qq.com> - 2.0.0-13
- ID:NA
- SUG:NA
- DESC: support usb flash drive mode
* Fri Jan 21 2022 zhang_xubo <2578876417@qq.com> - 2.0.0-12
- ID:NA
- SUG:NA