From 47a4fe030b1fde23c7c2926137e96943ff071230 Mon Sep 17 00:00:00 2001 From: yinjiaming Date: Fri, 28 Apr 2023 10:08:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=83=A8=E4=BB=B6=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E6=89=AB=E6=8F=8F=E5=87=BA=E7=9A=84bundle.json?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E6=95=B4=E6=94=B9=E4=BA=86?= =?UTF-8?q?=20=E4=B8=8D=E7=AC=A6=E5=90=88=E8=A7=84=E8=8C=83=E7=9A=84?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yinjiaming Change-Id: I11c321f8707d3e44dd7ee40dac35cf99907fb864 --- apps/lms/BUILD.gn | 2 +- bundle.json | 6 ++--- fs/vfs/BUILD.gn | 10 +++---- testsuites/kernel/BUILD.gn | 26 +++++++++---------- .../kernel/sample/kernel_base/core/BUILD.gn | 2 +- .../kernel/sample/kernel_base/ipc/BUILD.gn | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/lms/BUILD.gn b/apps/lms/BUILD.gn index f90f6363..dd58d2d3 100644 --- a/apps/lms/BUILD.gn +++ b/apps/lms/BUILD.gn @@ -73,5 +73,5 @@ executable("sample_usr_lms") { "-Wl,--wrap=strcpy", "-Wl,--wrap=strcat", ] - deps = [ "//kernel/liteos_a/kernel/extended/lms/usr:usrlmslib" ] + deps = [ "$LITEOSTOPDIR/kernel/extended/lms/usr:usrlmslib" ] } diff --git a/bundle.json b/bundle.json index 1a70a918..6a8d582b 100644 --- a/bundle.json +++ b/bundle.json @@ -28,15 +28,15 @@ "name": "liteos_a", "subsystem": "kernel", "syscap": [ - "SystemCapability.Kernel.liteos-a" + "SystemCapability.Kernel.Liteos-A" ], "features": [], - "adated_system_type": [ + "adapted_system_type": [ "small" ], "rom": "1.5MB", "ram": "2MB", - "deps": { + "external_deps": { "components": [ ], "third_party": [ diff --git a/fs/vfs/BUILD.gn b/fs/vfs/BUILD.gn index b04eddfb..d5b1d53d 100644 --- a/fs/vfs/BUILD.gn +++ b/fs/vfs/BUILD.gn @@ -34,11 +34,8 @@ module_switch = defined(LOSCFG_FS_VFS) module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { sources = [ - "$LITEOSTOPDIR/fs/vfs/epoll/fs_epoll.c", - "$LITEOSTOPDIR/fs/vfs/mount.c", - "$LITEOSTOPDIR/fs/vfs/path_cache.c", - "$LITEOSTOPDIR/fs/vfs/vnode.c", - "$LITEOSTOPDIR/fs/vfs/vnode_hash.c", + "epoll/fs_epoll.c", + "mount.c", "operation/fullpath.c", "operation/vfs_chattr.c", "operation/vfs_check.c", @@ -55,7 +52,10 @@ kernel_module(module_name) { "operation/vfs_readv.c", "operation/vfs_utime.c", "operation/vfs_writev.c", + "path_cache.c", "vfs_cmd/vfs_shellcmd.c", + "vnode.c", + "vnode_hash.c", ] sources += NUTTX_FS_DIRENT_SRC_FILES sources += NUTTX_FS_DRIVER_SRC_FILES diff --git a/testsuites/kernel/BUILD.gn b/testsuites/kernel/BUILD.gn index 77430a90..47987d1f 100644 --- a/testsuites/kernel/BUILD.gn +++ b/testsuites/kernel/BUILD.gn @@ -39,21 +39,21 @@ declare_args() { config("liteos_kernel_test_public") { cflags = [ "-Wno-error" ] include_dirs = [ - "//kernel/liteos_a/kernel/include", - "//kernel/liteos_a/kernel/base/include", - "//kernel/liteos_a/kernel/common", - "//kernel/liteos_a/arch/arm/arm/include", - "//kernel/liteos_a/arch/arm/include", - "//kernel/liteos_a/extended/include", + "$LITEOSTOPDIR/kernel/include", + "$LITEOSTOPDIR/kernel/base/include", + "$LITEOSTOPDIR/kernel/common", + "$LITEOSTOPDIR/arch/arm/arm/include", + "$LITEOSTOPDIR/arch/arm/include", + "$LITEOSTOPDIR/extended/include", "//third_party/musl/porting/liteos_a/kernel/include", "//third_party/bounds_checking_function/include/", - "//kernel/liteos_a/lib/libscrew/include", - "//kernel/liteos_a/fs/vfs", - "//kernel/liteos_a/fs/proc/include", - "//kernel/liteos_a/fs/jffs2/include", - "//kernel/liteos_a/fs/nfs/include", - "//kernel/liteos_a/bsd/compat/linuxkpi/include", - "//kernel/liteos_a/testsuites/kernel/include", + "$LITEOSTOPDIR/lib/libscrew/include", + "$LITEOSTOPDIR/fs/vfs", + "$LITEOSTOPDIR/fs/proc/include", + "$LITEOSTOPDIR/fs/jffs2/include", + "$LITEOSTOPDIR/fs/nfs/include", + "$LITEOSTOPDIR/bsd/compat/linuxkpi/include", + "include", ] if (LOSCFG_TEST_KERNEL_BASE) { diff --git a/testsuites/kernel/sample/kernel_base/core/BUILD.gn b/testsuites/kernel/sample/kernel_base/core/BUILD.gn index e62d5315..075fd3ab 100644 --- a/testsuites/kernel/sample/kernel_base/core/BUILD.gn +++ b/testsuites/kernel/sample/kernel_base/core/BUILD.gn @@ -260,5 +260,5 @@ kernel_module("test_core") { ] public_configs = - [ "//kernel/liteos_a/testsuites/kernel:liteos_kernel_test_public" ] + [ "$LITEOSTOPDIR/testsuites/kernel:liteos_kernel_test_public" ] } diff --git a/testsuites/kernel/sample/kernel_base/ipc/BUILD.gn b/testsuites/kernel/sample/kernel_base/ipc/BUILD.gn index 4a55f1a1..ce0a7dac 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/BUILD.gn +++ b/testsuites/kernel/sample/kernel_base/ipc/BUILD.gn @@ -107,5 +107,5 @@ kernel_module("test_ipc") { ] public_configs = - [ "//kernel/liteos_a/testsuites/kernel:liteos_kernel_test_public" ] + [ "$LITEOSTOPDIR/testsuites/kernel:liteos_kernel_test_public" ] }