[Feature][ZXW-452]merge P54U02 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I17e6795ab66e2b9d1cbbfec4b7c0028d666e177d
diff --git a/allbins/tools/mkfs_sh/bin/lib/libblkid.so.1 b/allbins/tools/mkfs_sh/bin/lib/libblkid.so.1
new file mode 100755
index 0000000..aa62ad1
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/lib/libblkid.so.1
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/lib/libcrypto.so.1.1 b/allbins/tools/mkfs_sh/bin/lib/libcrypto.so.1.1
new file mode 100755
index 0000000..7c23139
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/lib/libcrypto.so.1.1
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/lib/libcryptsetup.so.12 b/allbins/tools/mkfs_sh/bin/lib/libcryptsetup.so.12
new file mode 100755
index 0000000..df93914
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/lib/libcryptsetup.so.12
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/lib/libdevmapper.so.1.02 b/allbins/tools/mkfs_sh/bin/lib/libdevmapper.so.1.02
new file mode 100755
index 0000000..56729a7
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/lib/libdevmapper.so.1.02
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/lib/libjson-c.so.4 b/allbins/tools/mkfs_sh/bin/lib/libjson-c.so.4
new file mode 100755
index 0000000..b30b225
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/lib/libjson-c.so.4
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/lib/libpcre.so.1 b/allbins/tools/mkfs_sh/bin/lib/libpcre.so.1
new file mode 100755
index 0000000..e247bba
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/lib/libpcre.so.1
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/lib/libpopt.so.0 b/allbins/tools/mkfs_sh/bin/lib/libpopt.so.0
new file mode 100755
index 0000000..76cb6ea
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/lib/libpopt.so.0
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/lib/libselinux.so.1 b/allbins/tools/mkfs_sh/bin/lib/libselinux.so.1
new file mode 100755
index 0000000..322fd17
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/lib/libselinux.so.1
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/lib/libsepol.so.2 b/allbins/tools/mkfs_sh/bin/lib/libsepol.so.2
new file mode 100755
index 0000000..b7fb7df
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/lib/libsepol.so.2
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/lib/libuuid.so.1 b/allbins/tools/mkfs_sh/bin/lib/libuuid.so.1
new file mode 100755
index 0000000..0ad942f
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/lib/libuuid.so.1
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/mkfs.ubifs b/allbins/tools/mkfs_sh/bin/mkfs.ubifs
new file mode 100755
index 0000000..3f5d87a
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/mkfs.ubifs
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/mksquashfs4 b/allbins/tools/mkfs_sh/bin/mksquashfs4
index 76482d7..0670d62 100755
--- a/allbins/tools/mkfs_sh/bin/mksquashfs4
+++ b/allbins/tools/mkfs_sh/bin/mksquashfs4
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/setfiles b/allbins/tools/mkfs_sh/bin/setfiles
new file mode 100755
index 0000000..73d5c9d
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/setfiles
Binary files differ
diff --git a/allbins/tools/mkfs_sh/bin/veritysetup b/allbins/tools/mkfs_sh/bin/veritysetup
new file mode 100755
index 0000000..fa6cf44
--- /dev/null
+++ b/allbins/tools/mkfs_sh/bin/veritysetup
Binary files differ
diff --git a/allbins/tools/mkfs_sh/readme.txt b/allbins/tools/mkfs_sh/readme.txt
index 992c83d..ed531f9 100755
--- a/allbins/tools/mkfs_sh/readme.txt
+++ b/allbins/tools/mkfs_sh/readme.txt
@@ -1,7 +1,6 @@
1、环境
环境ubuntu 18.04
-sudo apt-get install policycoreutils cryptsetup-bin
-将签名工具SignTool拷贝到当前mkfs_sh目录
+如果需要支持dm-verity，需要将签名工具SignTool拷贝到当前mkfs_sh目录
2、命令帮助
bash rootfs_mksqushfs_demo.sh out_name dir_name vol_name selinux_file dm_verity
@@ -28,6 +27,7 @@
编辑ubifs_demo.sh，检查下面参数配置
UBI_ARGS为nandflash UBI参数配置。参考oemdata-ubi-default.cfg配置自己的cfg文件。
bash ubifs_demo.sh cap_oemdata.img oemdata-ubi-default.cfg
-特殊注明：避免将一个目录打包成ubifs镜像，否则需要mkfs.ubifs命令，并且要计算max leb count值。
+cap_oemdata.img为输出文件，oemdata-ubi-default.cfg为配置文件。
+特殊注明：避免将一个目录打包成ubifs镜像，否则需要mkfs.ubifs命令，并且要计算max leb count值，这样就会和很多参数耦合，也不利于ubifs异常恢复。
ubifs的预置文件可以放到squashfs文件系统里，第一次启动的时候拷贝到ubifs里。
diff --git a/allbins/tools/mkfs_sh/rootfs_mksqushfs_demo.sh b/allbins/tools/mkfs_sh/rootfs_mksqushfs_demo.sh
index 2be2acb..6403a6b 100755
--- a/allbins/tools/mkfs_sh/rootfs_mksqushfs_demo.sh
+++ b/allbins/tools/mkfs_sh/rootfs_mksqushfs_demo.sh
@@ -4,7 +4,10 @@
export PATH=$WORKDIR/bin:$PATH
UBI_ARGS="-m 0x1000 -p 0x40000 -s 0x1000 -Q 1024"
+#xz MKSQUASHFS_ARGS
MKSQUASHFS_ARGS="-nopad -noappend -root-owned -comp xz -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2 -b 256k -processors 1"
+#zstd MKSQUASHFS_ARGS
+#MKSQUASHFS_ARGS="-nopad -noappend -root-owned -comp zstd -b 256k -processors 1"
PRIVATE_KEY="$WORKDIR/SignTool/key/RSA_2048/private.k"
if [ $# -lt 5 ]; then
echo "[error] $0 parameter to less"