From 2e001d91c20226a7e3c51db15ec0d923654d2813 Mon Sep 17 00:00:00 2001
From: yangming_ha <yangming_ha@163.com>
Date: Sat, 8 May 2021 04:06:04 -0700
Subject: [PATCH] =?UTF-8?q?IssueNo:#I3NCG0=E3=80=90=20Linux=E5=86=85?=
 =?UTF-8?q?=E6=A0=B8=E5=BC=80=E6=BA=90=E3=80=91=E9=95=9C=E5=83=8F=E5=88=B6?=
 =?UTF-8?q?=E4=BD=9C=E5=B7=A5=E5=85=B7=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...linux_hi3516dv300.config => rootfs_linux.config} |  0
 make_rootfs/rootfs_linux_hi3518ev300.config         |  2 --
 make_rootfs/rootfsimg_linux.sh                      | 13 +++----------
 3 files changed, 3 insertions(+), 12 deletions(-)
 rename make_rootfs/{rootfs_linux_hi3516dv300.config => rootfs_linux.config} (100%)
 delete mode 100644 make_rootfs/rootfs_linux_hi3518ev300.config

diff --git a/make_rootfs/rootfs_linux_hi3516dv300.config b/make_rootfs/rootfs_linux.config
similarity index 100%
rename from make_rootfs/rootfs_linux_hi3516dv300.config
rename to make_rootfs/rootfs_linux.config
diff --git a/make_rootfs/rootfs_linux_hi3518ev300.config b/make_rootfs/rootfs_linux_hi3518ev300.config
deleted file mode 100644
index 39ccd5d..0000000
--- a/make_rootfs/rootfs_linux_hi3518ev300.config
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/foundation f 500 7 7
-/bin/apphilogcat f 500 4 4
diff --git a/make_rootfs/rootfsimg_linux.sh b/make_rootfs/rootfsimg_linux.sh
index 6865fe0..7c2308f 100755
--- a/make_rootfs/rootfsimg_linux.sh
+++ b/make_rootfs/rootfsimg_linux.sh
@@ -22,11 +22,8 @@ JFFS2_TOOL=mkfs.jffs2
 WIN_JFFS2_TOOL=mkfs.jffs2.exe
 VFAT_TOOL=mkfs.vfat
 MCOPY_TOOL=mcopy
-EXT4_TOOL=${ROOTFS_DIR}/../../../../vendor/hisi/camera/dvkit_product/linux/hi3516dv300/\
-Hi3516CV500_SDK_V2.0.3.0/Hi3516CV500_SDK_V2.0.3.0/osdrv/pub/bin/pc/mkfs.ext4
-E2FSPROGS_DIR=${ROOTFS_DIR}/../../../../vendor/hisi/camera/dvkit_product/linux/hi3516dv300/\
-Hi3516CV500_SDK_V2.0.3.0/Hi3516CV500_SDK_V2.0.3.0/open_source/e2fsprogs
-EXT4_SH=${ROOTFS_DIR}/../../../../vendor/hisi/camera/dvkit_product/linux/hi3516dv300/tools/makeextfs.sh
+EXT4_TOOL=mkfs.ext4
+EXT4_SH=$(dirname $(readlink -f "$0"))/../../../third_party/e2fsprogs/contrib/populate-extfs.sh
 
 tool_check() {
 local ret='0'
@@ -47,11 +44,7 @@ if [[ "${ROOTFS_DIR}" = *"rootfs" ]]; then
     fi
 fi
 
-if [[ "${ROOTFS_DIR}" =~ "dv300" ]] || [[ "${ROOTFS_DIR}" =~ "taurus" ]]; then
-    CONFIG_PATH=$(dirname $(readlink -f "$0"))/rootfs_linux_hi3516dv300.config
-elif [[ "${ROOTFS_DIR}" =~ "ev300" ]] || [[ "${ROOTFS_DIR}" =~ "aries" ]]; then
-    CONFIG_PATH=$(dirname $(readlink -f "$0"))/rootfs_linux_hi3518ev300.config
-fi
+CONFIG_PATH=$(dirname $(readlink -f "$0"))/rootfs_linux.config
 
 if [ "${FSTYPE}" = "jffs2" ]; then
     if [ "${system}" != "Linux" ] ; then
-- 
GitLab