From 2398c899d37acd18ba13304460d3248b3ada3e09 Mon Sep 17 00:00:00 2001 From: Riku Nomoto Date: Sat, 19 Dec 2020 20:35:59 +0900 Subject: Changed to not use SDKTARGETSYSROOT. Yocto sets the recipe-sysroot directory as the sysroot. Therefore, there is no need to define the path of the recipe-sysroot using SDKTARGETSYSROOT in the recipe. Signed-off-by: Riku Nomoto Change-Id: I9f3c7155a0f9656a916a2d6ba71371a4376b502b --- service/native/backup_manager/server/Makefile | 2 +- .../NS_XMLConfigeParser/library/src/Makefile | 2 +- .../client/NativeServices/Makefile | 4 +- .../library/include/agl_types_deprecated.h | 134 +++++++++++++++++++++ service/other/rpc_library/tool/Makefile | 8 +- service/system/system_manager/server/Makefile | 1 - .../system/task_manager/client/libtskmcfg/Makefile | 2 - .../vehicle/positioning/server/src/Sensor/Makefile | 2 +- 8 files changed, 145 insertions(+), 10 deletions(-) create mode 100644 service/other/rpc_library/library/include/agl_types_deprecated.h (limited to 'service') diff --git a/service/native/backup_manager/server/Makefile b/service/native/backup_manager/server/Makefile index 6e1149f..1a49297 100755 --- a/service/native/backup_manager/server/Makefile +++ b/service/native/backup_manager/server/Makefile @@ -30,7 +30,7 @@ VPATH += ./src ./include ../client/include/$(COMPONENT_NAME) ######### include paths ############# CPPFLAGS += -I./include CPPFLAGS += -I../client/include -CPPFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/libxml2 +CPPFLAGS += -I=/usr/include/libxml2 ######### frameworkunifiedlog options ############# CPPFLAGS += -DFRAMEWORKUNIFIEDLOGOPTIONS=0x08 -DFRAMEWORKUNIFIEDLOGAPPZONES=31,30,29,28,27,26,9,8,3 diff --git a/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile b/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile index 9ec700c..8b99c3b 100755 --- a/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile +++ b/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile @@ -33,7 +33,7 @@ libNS_XMLConfigParser_SRCS = ns_xml_reader.cpp ns_xml_writer.cpp ns_xmlparser.cp ######### add include path ############# -CPPFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/libxml2 +CPPFLAGS += -I=/usr/include/libxml2 CPPFLAGS += -I../../../include CPPFLAGS += -I../include CPPFLAGS += -I../../../include diff --git a/service/native/framework_unified/client/NativeServices/Makefile b/service/native/framework_unified/client/NativeServices/Makefile index de8de1d..b717adf 100755 --- a/service/native/framework_unified/client/NativeServices/Makefile +++ b/service/native/framework_unified/client/NativeServices/Makefile @@ -23,7 +23,7 @@ all: install-data:install_cfg install_cfg: - install -d -m 775 $(SDKTARGETSYSROOT)/etc/basesystem/ns_logger - install -m 644 -t $(SDKTARGETSYSROOT)/etc/basesystem/ns_logger scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg + install -d -m 775 /etc/basesystem/ns_logger + install -m 644 -t /etc/basesystem/ns_logger scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg include ../../../native_service.mk diff --git a/service/other/rpc_library/library/include/agl_types_deprecated.h b/service/other/rpc_library/library/include/agl_types_deprecated.h new file mode 100644 index 0000000..04e1b32 --- /dev/null +++ b/service/other/rpc_library/library/include/agl_types_deprecated.h @@ -0,0 +1,134 @@ +/* + * @copyright Copyright (c) 2017-2020 TOYOTA MOTOR CORPORATION. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _AGL_TYPES_DEPRECATED_H_ +#define _AGL_TYPES_DEPRECATED_H_ + +#include +#include +#include +#include +#include +#include + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include + +typedef u_int64_t _Uint64t; +typedef int64_t _Int64t; +typedef u_int32_t _Uint32t; +typedef int32_t _Int32t; +typedef u_int16_t _Uint16t; +typedef int16_t _Int16t; +typedef u_int8_t _Uint8t; +typedef int8_t _Int8t; + +typedef _Int8t _int8; +typedef _Uint8t _uint8; +typedef _Int16t _int16; +typedef _Uint16t _uint16; +typedef _Int32t _int32; +typedef _Uint32t _uint32; +typedef _Int64t _int64; +typedef _Uint64t _uint64; + + +#ifdef AGL_PosixBasedOS001LEGACY_USED +#define AGL_PROTECTION_NO_CACHE 0x00000800 +#define AGL_MAP_NON_INIT 0x00004000 +#define AGL_MAP_PHYSICAL 0x00010000 +#define AGL_NON_FD (-1) +#define AGL_MAP_DEV_FAILED ((unsigned long)MAP_FAILED) +#endif /*AGL_PosixBasedOS001LEGACY_USED*/ + +#define EOK 0 + +#ifdef AGL_PosixBasedOS001LEGACY_USED +#define agl_io_in32(_x) *(volatile unsigned long *)(_x) +#define agl_io_out32(_x, _y) {*(volatile unsigned long *)((void*)(_x)) = (_y);} +#endif /*AGL_PosixBasedOS001LEGACY_USED*/ + + + +#define __AGLDD_TYPEDEF_I64 +typedef int64_t i64; /* 8-byte signed integer */ + +#define __AGLDD_TYPEDEF_U64 +typedef uint64_t u64; /* 8-byte unsigned integer */ + +#define __AGLDD_TYPEDEF_U32 +typedef uint32_t u32; /* 4-byte unsigned integer */ + +#define __AGLDD_TYPEDEF_U16 +typedef uint16_t u16; /* 2-byte unsigned integer */ + +#define __AGLDD_TYPEDEF_I16 +typedef int16_t i16; /* 2-byte signed integer */ + +#define __AGLDD_TYPEDEF_U8 +typedef uint8_t u8; /* 1-byte unsigned integer */ + +#define __AGLDD_TYPEDEF_I8 +typedef int8_t i8; /* 1-byte signed integer */ + +#define __AGLDD_TYPEDEF_INT8 +typedef int8_t INT8; + +#define __AGLDD_TYPEDEF_INT16 +typedef int16_t INT16; + +#define __AGLDD_TYPEDEF_INT32 +typedef int32_t INT32; + +#define __AGLDD_TYPEDEF_INT64 +typedef int64_t INT64; + +#define __AGLDD_TYPEDEF_UINT8 +typedef uint8_t UINT8; + +#define __AGLDD_TYPEDEF_UINT16 +typedef uint16_t UINT16; + +#define __AGLDD_TYPEDEF_UINT32 +typedef uint32_t UINT32; + +#define __AGLDD_TYPEDEF_UINT64 +typedef uint64_t UINT64; + +#if !defined __WIN_TYPEDEF_BOOL +#define __AGLDD_TYPEDEF_BOOL +typedef uint32_t BOOL; +#endif + +#ifndef TRUE +#define TRUE 1 +#endif +#ifndef FALSE +#define FALSE 0 +#endif + +// AGL ASSERT MACRO +#ifdef AGL_ASSERT_ON +#define AGL_ASSERT_NOT_TESTED() \ +do {fprintf(stderr, "[%s][%s][%s:%d]AGL_ASSERT_NOT_TESTED.\n", \ + program_invocation_short_name, __func__, __FILE__, __LINE__);} while(0) +#else +#define AGL_ASSERT_NOT_TESTED() \ +do {} while(0) +#endif +#endif /* _AGL_TYPES_DEPRECATED_H_ */ diff --git a/service/other/rpc_library/tool/Makefile b/service/other/rpc_library/tool/Makefile index f4e1359..393f27c 100755 --- a/service/other/rpc_library/tool/Makefile +++ b/service/other/rpc_library/tool/Makefile @@ -24,8 +24,12 @@ YFLAGS := -d -t LEX := flex LFLAGS := -d -CPPFLAGS := -I../library/include -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h -CFLAGS := -Wall -Wno-unused-function -Wno-unused-variable -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CPPFLAGS += -I../library/include +CPPFLAGS += -include agl_types_deprecated.h + +CFLAGS += -Wall -Wno-unused-function -Wno-unused-variable +CFLAGS += -I../library/include +CFLAGS += -include agl_types_deprecated.h rpc_apidef: apidef.tab.o lex.yy.o apidef.o $(CXX) $(CPPFLAGS) -o $@ $^ diff --git a/service/system/system_manager/server/Makefile b/service/system/system_manager/server/Makefile index 8571a75..1c9b4aa 100755 --- a/service/system/system_manager/server/Makefile +++ b/service/system/system_manager/server/Makefile @@ -106,7 +106,6 @@ LINK_CXX=Y install-data: install_data install_data: - cpp -P -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_thread.h ./sm_launch__CWORD84_.xml ./sm_launch.tmp.xml install -d -m 755 $(DESTDIR)/etc/basesystem/BS/ss/system_manager/rwdata install -m 644 ./sm_launch.cfg $(DESTDIR)/etc/basesystem/BS/ss/system_manager/rwdata install -d -m 755 $(DESTDIR)/var/local/lib/basesystem/nv/BS/ss/system_manager/rwdata diff --git a/service/system/task_manager/client/libtskmcfg/Makefile b/service/system/task_manager/client/libtskmcfg/Makefile index 1f3d279..5b1e3df 100755 --- a/service/system/task_manager/client/libtskmcfg/Makefile +++ b/service/system/task_manager/client/libtskmcfg/Makefile @@ -79,8 +79,6 @@ agl_thread.h:$(WAKESHUTCONF_DIR)/agl_thread.h tskm_launch.xml:$(WAKESHUTCONF_DIR)/tskm_launch.xml agl_thread.h $(HOST_CPP) -P -include agl_thread.h $< > $@ -#tskm_launch.xml:$(SVCONF_DIR)/tskm_launch.xml $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_thread.h -# $(HOST_CPP) -P -include agl_thread.h $< > $@ $(XMLOUTFILE):top.xml $(PARSEXMLCMD) $(CONFIG_FILES) $(XMLCHECKER) $(XMLCHECKEROPT) $< diff --git a/service/vehicle/positioning/server/src/Sensor/Makefile b/service/vehicle/positioning/server/src/Sensor/Makefile index 5c0c525..4463da1 100755 --- a/service/vehicle/positioning/server/src/Sensor/Makefile +++ b/service/vehicle/positioning/server/src/Sensor/Makefile @@ -155,7 +155,7 @@ CPPFLAGS += -I../ServiceInterface/VehicleIf CPPFLAGS += -I../nsfw/include #CPPFLAGS += -I../../../../diag_code/library/include -CPPFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem/vehicle_service +CPPFLAGS += -I=/usr/include/basesystem/vehicle_service ######### add compile option ############# CPPFLAGS += -DLINUX -- cgit 1.2.3-korg