From efd0e27784fc02cdf6eda285d17519a9ff65fb7d Mon Sep 17 00:00:00 2001
From: Far <yesiyuan2@huawei.com>
Date: Fri, 29 Apr 2022 10:02:55 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20fbc81cd=20from=20https://gitee.com/yesi?=
 =?UTF-8?q?yuanjim/kernel=5Fliteos=5Fa/pulls/877=20fix:=20LiteOS-A?=
 =?UTF-8?q?=E5=86=85=E6=A0=B8jffs2=E6=96=87=E4=BB=B6=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=81=9C=E6=AD=A2=E4=BD=BF=E7=94=A8third=5Fparty=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84Linux=5FKernel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Close #I5564N
Signed-off-by: Far <yesiyuan2@huawei.com>
---
 BUILD.gn                     | 1 -
 bundle.json                  | 3 +--
 fs/BUILD.gn                  | 1 -
 fs/Kconfig                   | 4 ++--
 fs/jffs2/BUILD.gn            | 1 -
 fs/jffs2/Makefile            | 6 +++---
 tools/build/mk/los_config.mk | 4 ++--
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index e8d9b447..ed823066 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -75,7 +75,6 @@ generate_notice_file("kernel_notice_file") {
     "$LITEOSTHIRDPARTY/musl",
     "$LITEOSTHIRDPARTY/zlib",
     "$LITEOSTHIRDPARTY/FatFs",
-    "$LITEOSTHIRDPARTY/Linux_Kernel",
     "$LITEOSTHIRDPARTY/lwip",
     "$LITEOSTHIRDPARTY/NuttX",
     "$LITEOSTHIRDPARTY/mtd-utils",
diff --git a/bundle.json b/bundle.json
index ace6fa5c..1a70a918 100644
--- a/bundle.json
+++ b/bundle.json
@@ -43,7 +43,6 @@
                 "bounds_checking_function",
                 "toybox",
                 "NuttX",
-                "Linux_Kernel",
                 "FatFs",
                 "mksh",
                 "musl",
@@ -63,4 +62,4 @@
             "test": []
         }
     }
-}
\ No newline at end of file
+}
diff --git a/fs/BUILD.gn b/fs/BUILD.gn
index 26b27df3..16bb7778 100644
--- a/fs/BUILD.gn
+++ b/fs/BUILD.gn
@@ -33,7 +33,6 @@ group("fs") {
   deps = [
     "fat",
     "fat/virpart",
-    "jffs2",
     "nfs",
     "patchfs",
     "proc",
diff --git a/fs/Kconfig b/fs/Kconfig
index 13deaebe..032668fb 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -4,7 +4,7 @@ source "fs/ramfs/Kconfig"
 source "fs/romfs/Kconfig"
 source "fs/nfs/Kconfig"
 source "fs/proc/Kconfig"
-source "fs/jffs2/Kconfig"
+#source "fs/jffs2/Kconfig"
 source "fs/rootfs/Kconfig"
 source "fs/patchfs/Kconfig"
-source "fs/zpfs/Kconfig"
\ No newline at end of file
+source "fs/zpfs/Kconfig"
diff --git a/fs/jffs2/BUILD.gn b/fs/jffs2/BUILD.gn
index e90e0e28..283c9eb1 100644
--- a/fs/jffs2/BUILD.gn
+++ b/fs/jffs2/BUILD.gn
@@ -28,7 +28,6 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("//third_party/Linux_Kernel/Linux_Kernel.gni")
 
 module_switch = defined(LOSCFG_FS_JFFS)
 module_name = get_path_info(rebase_path("."), "name")
diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile
index 09c9fefd..38a6daac 100644
--- a/fs/jffs2/Makefile
+++ b/fs/jffs2/Makefile
@@ -32,11 +32,11 @@ include $(LITEOSTOPDIR)/config.mk
 MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard src/*.c) \
-		$(wildcard $(LITEOSTHIRDPARTY)/Linux_Kernel/fs/jffs2/*.c)
+		$(wildcard $(LITEOSTOPDIR)/../linux/linux-5.10/fs/jffs2/*.c)
 LOCAL_INCLUDE := \
 		-I $(LITEOSTOPDIR)/fs/jffs2/include \
-		-I $(LITEOSTHIRDPARTY)/Linux_Kernel/fs/jffs2 \
-		-I $(LITEOSTHIRDPARTY)/Linux_Kernel/fs
+		-I $(LITEOSTOPDIR)/../linux/linux-5.10/fs/jffs2 \
+		-I $(LITEOSTOPDIR)/../linux/linux-5.10/fs
 LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)
diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk
index 81c6fbb7..6b0c689f 100644
--- a/tools/build/mk/los_config.mk
+++ b/tools/build/mk/los_config.mk
@@ -306,8 +306,8 @@ endif
 
 
 ifeq ($(LOSCFG_FS_JFFS), y)
-    LITEOS_BASELIB  += -ljffs2
-    LIB_SUBDIRS     += fs/jffs2
+#    LITEOS_BASELIB  += -ljffs2
+#    LIB_SUBDIRS     += fs/jffs2
 endif
 
 ifeq ($(LOSCFG_PLATFORM_ROOTFS), y)
-- 
GitLab