From a2f04f489c3756bfc24c1da2e0c27b328d6da2e6 Mon Sep 17 00:00:00 2001
From: jiangqianrong <jiangqianrong1@huawei.com>
Date: Wed, 23 Jul 2025 14:54:00 +0800
Subject: [PATCH] Eliminate difference between master and trunk

Signed-off-by: jiangqianrong <jiangqianrong1@huawei.com>
---
 BUILD.gn   | 4 +++-
 install.sh | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index a53f1874..c4bacbc2 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -11,7 +11,8 @@ action("e2fsprogs_action") {
     "//third_party/e2fsprogs/1003-add-dac-config.patch",
     "//third_party/e2fsprogs/1004-modify-code-to-compile.patch",
     "//third_party/e2fsprogs/1005-read-vfat-chinese-label.patch",
-    "//third_party/e2fsprogs/1006-add-hmfs-for-blkid.patch"
+    "//third_party/e2fsprogs/1006-add-hmfs-for-blkid.patch",
+    "//third_party/e2fsprogs/1007-blkid-support-skip-specified-filesystem.patch"
   ]
   outputs = [
     "${target_gen_dir}/e2fsprogs",
@@ -234,6 +235,7 @@ action("e2fsprogs_action") {
 }
 
 E2FSPROGS_DIR = rebase_path("${target_gen_dir}/e2fsprogs")
+print("E2FSPROGS_DIR is ${E2FSPROGS_DIR}")
 
 group("e2fsprogs") {
   deps = [
diff --git a/install.sh b/install.sh
index 2d15aa36..5a3e383d 100755
--- a/install.sh
+++ b/install.sh
@@ -7,7 +7,6 @@
 # Copyright(c) 2023 Huawei Device Co., Ltd.
 
 set -e
-set -x
 mkdir -p $1
 cd $1
 touch test.lock
-- 
Gitee