!678 adapt the modification of e2fsprog switching to OpenEuler

Merge pull request !678 from 张文迪/master
This commit is contained in:
openharmony_ci
2023-05-24 02:13:29 +00:00
committed by Gitee
+4 -1
View File
@@ -23,7 +23,9 @@ WIN_JFFS2_TOOL=mkfs.jffs2.exe
VFAT_TOOL=mkfs.vfat
MCOPY_TOOL=mcopy
EXT4_TOOL=mkfs.ext4
EXT4_SH=$(dirname $(readlink -f "$0"))/../../../third_party/e2fsprogs/contrib/populate-extfs.sh
EXT4_SH=$(dirname $(readlink -f "$0"))/../../../third_party/e2fsprogs/e2fsprogs/contrib/populate-extfs.sh
INSTALL_E2FSPROGS_SH=$(dirname $(readlink -f "$0"))/../../../third_party/e2fsprogs/install.sh
INSTALL_E2FSPROGS_PATH=$(dirname $(readlink -f "$0"))/../../../third_party/e2fsprogs
tool_check() {
local ret='0'
@@ -102,6 +104,7 @@ elif [ "${FSTYPE}" = "ext4" ]; then
COUNT_SIZE="$(expr ${EMMC_ROOTFS_SIZE} \* 1024 \* 2)"
dd if=/dev/zero of=${ROOTFS_IMG} bs=512 count=${COUNT_SIZE}
${EXT4_TOOL} ${ROOTFS_IMG}
${INSTALL_E2FSPROGS_SH} ${INSTALL_E2FSPROGS_PATH}
${EXT4_SH} ${ROOTFS_DIR} ${ROOTFS_IMG} ${CONFIG_PATH}
fi
else