yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1208 【同步4.1 Release】容器编译失败问题同步 

Merge pull request !1208 from hw_llm/cherry-pick-1723789557
This commit is contained in:
openharmony_ci 2024-08-16 10:12:17 +00:00 committed by Gitee
parent 4e90ebdd73 03a2bf2c68
commit 08b1ab779c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/extended/plimit/los_devicelimit.c
View File

@ -488,7 +488,7 @@ UINT32 OsDevLimitWriteDeny(ProcLimitSet *plimit, const CHAR *buf, UINT32 size)
STATIC VOID DevLimitItemSetAccess(CHAR *accArray, INT16 access) STATIC VOID DevLimitItemSetAccess(CHAR *accArray, INT16 access)
{ {
INT32 index = 0; INT32 index = 0;
(VOID)memset_s(acc, ACCLEN, 0, ACCLEN); (VOID)memset_s(accArray, ACCLEN, 0, ACCLEN);
if (access & DEVLIMIT_ACC_READ) { if (access & DEVLIMIT_ACC_READ) {
accArray[index] = 'r'; accArray[index] = 'r';
index++; index++;

5
tools/build/mk/los_config.mk
View File

@ -124,6 +124,11 @@ LITEOS_BASELIB += -lcommon
LIB_SUBDIRS += kernel/common LIB_SUBDIRS += kernel/common
LITEOS_KERNEL_INCLUDE += -I $(LITEOSTOPDIR)/kernel/common LITEOS_KERNEL_INCLUDE += -I $(LITEOSTOPDIR)/kernel/common
ifeq ($(LOSCFG_KERNEL_CONTAINER), y)
LITEOS_BASELIB += -lcontainer
LIB_SUBDIRS += kernel/extended/container
endif
ifeq ($(LOSCFG_KERNEL_CPPSUPPORT), y) ifeq ($(LOSCFG_KERNEL_CPPSUPPORT), y)
LITEOS_BASELIB += -lcppsupport LITEOS_BASELIB += -lcppsupport
LIB_SUBDIRS += kernel/extended/cppsupport LIB_SUBDIRS += kernel/extended/cppsupport