diff options
Diffstat (limited to 'meta-agl/meta-agl-basesystem')
5 files changed, 67 insertions, 3 deletions
diff --git a/meta-agl/meta-agl-basesystem/conf/include/agl-basesystem-base.inc b/meta-agl/meta-agl-basesystem/conf/include/agl-basesystem-base.inc index 876baaa5..5274ab59 100644 --- a/meta-agl/meta-agl-basesystem/conf/include/agl-basesystem-base.inc +++ b/meta-agl/meta-agl-basesystem/conf/include/agl-basesystem-base.inc @@ -1,7 +1,7 @@ # AGL specific package configuration # # Add systemd configuration -DISTRO_FEATURES_append = " systemd ${DISTRO_FEATURES_LIBC}" +DISTRO_FEATURES_append = " systemd " #VIRTUAL-RUNTIME_init_manager = "systemd" TOOLCHAIN_HOST_TASK_append += " nativesdk-os-rpclibrary-tool nativesdk-perl-module-app-cpan nativesdk-perl-module-json-pp" diff --git a/meta-agl/meta-agl-basesystem/conf/layer.conf b/meta-agl/meta-agl-basesystem/conf/layer.conf index 4052619f..af4e930b 100644 --- a/meta-agl/meta-agl-basesystem/conf/layer.conf +++ b/meta-agl/meta-agl-basesystem/conf/layer.conf @@ -13,4 +13,4 @@ BBFILE_PRIORITY_agl-basesystem = "70" # for agl-basefiles recipe HOSTTOOLS += "xpath xmllint" -LAYERSERIES_COMPAT_agl-basesystem = "thud" +LAYERSERIES_COMPAT_agl-basesystem = "thud dunfell" diff --git a/meta-agl/meta-agl-basesystem/recipes-core/kernel-module-evklib/kernel-module-evklib-1.0.0/evk_lib.c b/meta-agl/meta-agl-basesystem/recipes-core/kernel-module-evklib/kernel-module-evklib-1.0.0/evk_lib.c index d5c1718e..3a7c9af8 100644 --- a/meta-agl/meta-agl-basesystem/recipes-core/kernel-module-evklib/kernel-module-evklib-1.0.0/evk_lib.c +++ b/meta-agl/meta-agl-basesystem/recipes-core/kernel-module-evklib/kernel-module-evklib-1.0.0/evk_lib.c @@ -1286,7 +1286,11 @@ evk_ioctl(struct file *filp, unsigned int cmd, break; case EVK_IOC_CREATE_MESSAGE_QUEUE: +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)) + if (access_ok(arg, sizeof(mesq))) { /* pgr0039 */ +#else if (access_ok(VERIFY_READ, arg, sizeof(mesq))) { /* pgr0039 */ +#endif if (copy_from_user(&mesq, (EV_Flag *)arg, sizeof(mesq))) { ret = -EFAULT; break; @@ -1300,7 +1304,11 @@ evk_ioctl(struct file *filp, unsigned int cmd, break; case EVK_IOC_ALLOC_FLAG_ID: +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)) + if (access_ok(arg, sizeof(queueID))) { /* pgr0039 */ +#else if (access_ok(VERIFY_WRITE, arg, sizeof(queueID))) { /* pgr0039 */ +#endif evk_alloc_flagID(&queueID); if (put_user(queueID, (EV_ID *)arg)) { /* pgr0039 */ ret = -EFAULT; @@ -1313,7 +1321,11 @@ evk_ioctl(struct file *filp, unsigned int cmd, break; case EVK_IOC_ALLOC_FLAG64_ID: +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)) + if (access_ok(arg, sizeof(queueID))) { /* pgr0039 */ +#else if (access_ok(VERIFY_WRITE, arg, sizeof(queueID))) { /* pgr0039 */ +#endif evk_alloc_flag64ID(&queueID); if (put_user(queueID, (EV_ID *)arg)) { /* pgr0039 */ ret = -EFAULT; @@ -1326,7 +1338,11 @@ evk_ioctl(struct file *filp, unsigned int cmd, break; case EVK_IOC_ALLOC_QUEUE_ID: +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)) + if (access_ok(arg, sizeof(queueID))) { /* pgr0039 */ +#else if (access_ok(VERIFY_WRITE, arg, sizeof(queueID))) { /* pgr0039 */ +#endif evk_alloc_queueID(&queueID); if (put_user(queueID, (EV_ID *)arg)) { /* pgr0039 */ ret = -EFAULT; @@ -1344,7 +1360,11 @@ evk_ioctl(struct file *filp, unsigned int cmd, break; case EVK_IOC_STORE_FLAG: +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)) + if (access_ok(arg, sizeof(EV_Flag))) { /* pgr0039 */ +#else if (access_ok(VERIFY_READ, arg, sizeof(EV_Flag))) { /* pgr0039 */ +#endif ret = evk_store_flag((EV_Flag *)arg, evk_mem_user); } else { ret = -EFAULT; @@ -1352,7 +1372,11 @@ evk_ioctl(struct file *filp, unsigned int cmd, break; case EVK_IOC_STORE_FLAG64: +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)) + if (access_ok(arg, sizeof(EV_Flag64))) { /* pgr0039 */ +#else if (access_ok(VERIFY_READ, arg, sizeof(EV_Flag64))) { /* pgr0039 */ +#endif ret = evk_store_flag64((EV_Flag64 *)arg, evk_mem_user); } else { ret = -EFAULT; @@ -1360,7 +1384,11 @@ evk_ioctl(struct file *filp, unsigned int cmd, break; case EVK_IOC_STORE_MESSAGE: +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)) + if (access_ok(arg, sizeof(EV_Message))) { /* pgr0039 */ +#else if (access_ok(VERIFY_READ, arg, sizeof(EV_Message))) { /* pgr0039 */ +#endif ret = evk_store_message((EV_Message *)arg, evk_mem_user); } else { ret = -EFAULT; @@ -1388,7 +1416,11 @@ evk_ioctl(struct file *filp, unsigned int cmd, peek_only = 0; wait = 0; get_event: +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)) + if (access_ok(arg, sizeof(EV_Event))) { /* pgr0039 */ +#else if (access_ok(VERIFY_WRITE, arg, sizeof(EV_Event))) { /* pgr0039 */ +#endif ret = evk_get_event((EV_Event *)arg, peek_only, wait, evk_mem_user); } else { ret = -EFAULT; @@ -1403,7 +1435,11 @@ evk_ioctl(struct file *filp, unsigned int cmd, case EVK_IOC_GET_NEXT_EVENT: peek_only = 0; get_next: +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)) + if (access_ok(arg, sizeof(EVK_Next_Event_Query))) { /* pgr0039 */ +#else if (access_ok(VERIFY_WRITE, arg, sizeof(EVK_Next_Event_Query))) { /* pgr0039 */ +#endif ret = evk_get_next_event((EVK_Next_Event_Query *)arg, peek_only); } else { ret = -EFAULT; diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/ns-commonlibrary/files/0001-cl_error-remover-gettid-inline-declaration.patch b/meta-agl/meta-agl-basesystem/recipes-graphics/ns-commonlibrary/files/0001-cl_error-remover-gettid-inline-declaration.patch new file mode 100644 index 00000000..de0540c7 --- /dev/null +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/ns-commonlibrary/files/0001-cl_error-remover-gettid-inline-declaration.patch @@ -0,0 +1,25 @@ +From 43656b137f48c4db566cc288f8cabc0f1af6aa4c Mon Sep 17 00:00:00 2001 +From: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> +Date: Wed, 28 Oct 2020 04:27:09 +0900 +Subject: [PATCH] cl_error: remover gettid inline declaration + +gettid is multiple decdeclaration in cl_error +--- + common_library/client/include/cl_error.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/common_library/client/include/cl_error.h b/common_library/client/include/cl_error.h +index 84bf64e..1441262 100644 +--- a/common_library/client/include/cl_error.h ++++ b/common_library/client/include/cl_error.h +@@ -21,10 +21,6 @@ + #include <unistd.h> + #include <asm/unistd.h> + +-static inline int gettid(void) { // NOLINT(readability/nolint) +- return (int)syscall(__NR_gettid); // NOLINT(readability/casting) +-} +- + #define _num_to_str(num) #num + #define num_to_str(num) _num_to_str(num) + #define CL_PERROR(msg) \ diff --git a/meta-agl/meta-agl-basesystem/recipes-graphics/ns-commonlibrary/ns-commonlibrary_1.0.0.bb b/meta-agl/meta-agl-basesystem/recipes-graphics/ns-commonlibrary/ns-commonlibrary_1.0.0.bb index 3d7da9b8..06b17d5c 100644 --- a/meta-agl/meta-agl-basesystem/recipes-graphics/ns-commonlibrary/ns-commonlibrary_1.0.0.bb +++ b/meta-agl/meta-agl-basesystem/recipes-graphics/ns-commonlibrary/ns-commonlibrary_1.0.0.bb @@ -10,9 +10,12 @@ FILES_${PN} += " \ " FILES_${PN}-dev += "/usr/agl/include/*" -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/ns-commonlibrary" +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/toyota.git;protocol=https;branch=sandbox/ToshikazuOhiwa/ns-commonlibrary \ + file://0001-cl_error-remover-gettid-inline-declaration.patch \ + " SRCREV = "${AUTOREV}" + PV = "1.0.0+gitr${SRCPV}" S = "${WORKDIR}/git" |