Thanks, applied as 9bb1414cf8745b1cf91a3973518274d66e0cb7c3. Michael
[sent from post-receive hook] On Sun, 14 Mar 2021 14:35:33 +0100, Sascha Hauer <s.ha...@pengutronix.de> wrote: > Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de> > Message-Id: <20210303114404.14817-1-s.ha...@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git > a/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch > > b/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch > deleted file mode 100644 > index 0dfd003518ed..000000000000 > --- > a/patches/open62541-1.0/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch > +++ /dev/null > @@ -1,224 +0,0 @@ > -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <b.es...@pengutronix.de> > -Date: Mon, 2 Dec 2019 14:38:38 +0100 > -Subject: [PATCH] CMake: Allow UA_NODESET_DIR to be custom defined. > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -This makes it easier for developers to keep all ua-nodesets XML > -definitions in a common location. > - > -Backported from: https://github.com/open62541/open62541/pull/3310 > - > -Signed-off-by: Björn Esser <b.es...@pengutronix.de> > ---- > - CMakeLists.txt | 14 +++++++++----- > - doc/nodeset_compiler.rst | 22 +++++++++++----------- > - examples/CMakeLists.txt | 4 ---- > - examples/nodeset/CMakeLists.txt | 6 +++--- > - tests/nodeset-compiler/CMakeLists.txt | 14 +++++++------- > - tools/cmake/macros_public.cmake | 2 +- > - 6 files changed, 31 insertions(+), 31 deletions(-) > - > -diff --git a/CMakeLists.txt b/CMakeLists.txt > -index d426e1da66fe..fbbafd8f2791 100644 > ---- a/CMakeLists.txt > -+++ b/CMakeLists.txt > -@@ -15,7 +15,6 @@ include(GNUInstallDirs) > - > - # Set when installed via make install > - set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools) > --set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset) > - > - include(macros_internal) > - include(macros_public) > -@@ -134,6 +133,11 @@ option(UA_ENABLE_ENCRYPTION "Enable encryption support > (uses mbedTLS)" OFF) > - option(UA_ENABLE_MICRO_EMB_DEV_PROFILE "Builds CTT Compliant Micro Embedded > Device Server Profile" OFF) > - option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF) > - > -+if(NOT UA_NODESET_DIR) > -+ set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset) > -+endif() > -+set(open62541_NODESET_DIR ${UA_NODESET_DIR}) > -+ > - # Namespace Zero > - set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated > namespace zero (minimal/reduced/full)") > - SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED" > "FULL") > -@@ -770,7 +774,7 @@ set(UA_FILE_NODESETS) > - > - if(UA_NAMESPACE_ZERO STREQUAL "FULL") > - if(NOT UA_FILE_NS0) > -- set(UA_FILE_NS0 > ${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml) > -+ set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml) > - endif() > - set(UA_FILE_NODESETS "${UA_FILE_NS0}") > - > -@@ -779,9 +783,9 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL") > - endif() > - > - > -- set(UA_FILE_NODEIDS > ${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/NodeIds.csv) > -- set(UA_FILE_STATUSCODES > ${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/StatusCode.csv) > -- set(UA_FILE_TYPES_BSD > ${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd) > -+ set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv) > -+ set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv) > -+ set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd) > - else() > - if(NOT UA_FILE_NS0) > - set(UA_FILE_NS0 > ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Minimal.xml) > -diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst > -index dd752ccd70a9..34fc8f800480 100644 > ---- a/doc/nodeset_compiler.rst > -+++ b/doc/nodeset_compiler.rst > -@@ -292,17 +292,17 @@ Here are some examples for the ``DI`` and ``PLCOpen`` > nodesets:: > - # Generate types and namespace for DI > - ua_generate_nodeset_and_datatypes( > - NAME "di" > -- FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv" > -- FILE_BSD > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd" > -+ FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv" > -+ FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd" > - NAMESPACE_IDX 2 > -- FILE_NS > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml" > -+ FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" > - ) > - > - # generate PLCopen namespace which is using DI > - ua_generate_nodeset_and_datatypes( > - NAME "plc" > - # PLCopen does not define custom types. Only generate the nodeset > -- FILE_NS > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/PLCopen/Opc.Ua.Plc.NodeSet2.xml" > -+ FILE_NS "${UA_NODESET_DIR}/PLCopen/Opc.Ua.Plc.NodeSet2.xml" > - # PLCopen depends on the di nodeset, which must be generated before > - DEPENDS "di" > - ) > -@@ -403,8 +403,8 @@ This DI nodeset makes use of some additional data types > in ``deps/ua-nodeset/DI/ > - NAME "ua_types_di" > - TARGET_SUFFIX "types-di" > - NAMESPACE_IDX 2 > -- FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv" > -- FILES_BSD > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd" > -+ FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv" > -+ FILES_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd" > - ) > - > - The ``NAMESPACE_IDX`` parameter indicates the namespace index of the > generated node IDs for the type definitions. Currently we need to rely that > the namespace is also added at this position in the final server. There is no > automatic inferring yet (pull requests are warmly welcome). > -@@ -414,11 +414,11 @@ Now you can compile the DI nodeset XML using the > following command:: > - > - ua_generate_nodeset( > - NAME "di" > -- FILE > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml" > -+ FILE "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" > - TYPES_ARRAY "UA_TYPES_DI" > - INTERNAL > - DEPENDS_TYPES "UA_TYPES" > -- DEPENDS_NS > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml" > -+ DEPENDS_NS "${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml" > - DEPENDS_TARGET "open62541-generator-types-di" > - ) > - > -@@ -429,13 +429,13 @@ Next we can generate the PLCopen nodeset. Since it > doesn't require any additiona > - > - ua_generate_nodeset( > - NAME "plc" > -- FILE > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/PLCopen/Opc.Ua.Plc.NodeSet2.xml" > -+ FILE "${UA_NODESET_DIR}/PLCopen/Opc.Ua.Plc.NodeSet2.xml" > - INTERNAL > - DEPENDS_TYPES > - "UA_TYPES" "UA_TYPES_DI" > - DEPENDS_NS > -- > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml" > -- > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml" > -+ "${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml" > -+ "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" > - DEPENDS_TARGET "open62541-generator-ns-di" > - ) > - > -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt > -index d46f853ecde6..353a0fbf992d 100644 > ---- a/examples/CMakeLists.txt > -+++ b/examples/CMakeLists.txt > -@@ -26,10 +26,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) > - set(UA_TOOLS_DIR ${open62541_TOOLS_DIR}) > - endif() > - > -- if(NOT UA_NODESET_DIR) > -- set(UA_NODESET_DIR ${open62541_NODESET_DIR}) > -- endif() > -- > - function(assign_source_group) > - # define empty function. We don't need it in standalone > - endfunction(assign_source_group) > -diff --git a/examples/nodeset/CMakeLists.txt > b/examples/nodeset/CMakeLists.txt > -index c4b612d911d5..0a5fe38ef229 100644 > ---- a/examples/nodeset/CMakeLists.txt > -+++ b/examples/nodeset/CMakeLists.txt > -@@ -63,10 +63,10 @@ endif() > - ################### > - > - if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) > -- set(FILE_CSV_DIRPREFIX ${CMAKE_SOURCE_DIR}/deps/ua-nodeset) > -- set(FILE_BSD_PLCOPEN_DIRPREFIX ${CMAKE_SOURCE_DIR}/deps/ua-nodeset) > -+ set(FILE_CSV_DIRPREFIX ${UA_NODESET_DIR}) > -+ set(FILE_BSD_PLCOPEN_DIRPREFIX ${UA_NODESET_DIR}) > - set(FILE_BSD_POWERLINK_DIRPREFIX ${PROJECT_SOURCE_DIR}/nodeset) > -- set(FILE_NS_DIRPREFIX ${CMAKE_SOURCE_DIR}/deps/ua-nodeset) > -+ set(FILE_NS_DIRPREFIX ${UA_NODESET_DIR}) > - else() > - set(FILE_CSV_DIRPREFIX ${UA_NODESET_DIR}) > - set(FILE_BSD_PLCOPEN_DIRPREFIX ${UA_NODESET_DIR}) > -diff --git a/tests/nodeset-compiler/CMakeLists.txt > b/tests/nodeset-compiler/CMakeLists.txt > -index 153759aa16c6..2b68e3926499 100644 > ---- a/tests/nodeset-compiler/CMakeLists.txt > -+++ b/tests/nodeset-compiler/CMakeLists.txt > -@@ -11,22 +11,22 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL") > - # Generate types and namespace for DI > - ua_generate_nodeset_and_datatypes( > - NAME "tests-di" > -- FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv" > -- FILE_BSD > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd" > -+ FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv" > -+ FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd" > - NAMESPACE_IDX 2 > - OUTPUT_DIR "${GENERATE_OUTPUT_DIR}" > -- FILE_NS > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml" > -+ FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" > - INTERNAL > - ) > - > - # Generate types and namespace for ADI > - ua_generate_nodeset_and_datatypes( > - NAME "tests-adi" > -- FILE_CSV > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/ADI/OpcUaAdiModel.csv" > -- FILE_BSD > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/ADI/Opc.Ua.Adi.Types.bsd" > -+ FILE_CSV "${UA_NODESET_DIR}/ADI/OpcUaAdiModel.csv" > -+ FILE_BSD "${UA_NODESET_DIR}/ADI/Opc.Ua.Adi.Types.bsd" > - NAMESPACE_IDX 3 > - OUTPUT_DIR "${GENERATE_OUTPUT_DIR}" > -- FILE_NS > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/ADI/Opc.Ua.Adi.NodeSet2.xml" > -+ FILE_NS "${UA_NODESET_DIR}/ADI/Opc.Ua.Adi.NodeSet2.xml" > - DEPENDS "tests-di" > - INTERNAL > - ) > -@@ -46,7 +46,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL") > - ua_generate_nodeset_and_datatypes( > - NAME "tests-plc" > - # PLCopen does not define custom types. Only generate the nodeset > -- FILE_NS > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/PLCopen/Opc.Ua.Plc.NodeSet2.xml" > -+ FILE_NS "${UA_NODESET_DIR}/PLCopen/Opc.Ua.Plc.NodeSet2.xml" > - # PLCopen depends on the di nodeset, which must be generated before > - OUTPUT_DIR "${GENERATE_OUTPUT_DIR}" > - DEPENDS "tests-di" > -diff --git a/tools/cmake/macros_public.cmake > b/tools/cmake/macros_public.cmake > -index a6a36f3d1090..751b679a37d8 100644 > ---- a/tools/cmake/macros_public.cmake > -+++ b/tools/cmake/macros_public.cmake > -@@ -100,7 +100,7 @@ endfunction() > - # passed which will all combined to one resulting code. > - # IMPORT_BSD Combination of types array and path to the .bsd file > containing additional type definitions referenced by > - # the FILES_BSD files. The value is separated with a hash > sign, i.e. > --# > 'UA_TYPES#${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd' > -+# 'UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd' > - # Multiple files can be passed which will all be imported. > - # [FILES_SELECTED] Optional path to a simple text file which contains a > list of types which should be included in the generation. > - # The file should contain one type per line. Multiple > files can be passed to this argument. > diff --git > a/patches/open62541-1.2/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch > > b/patches/open62541-1.2/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch > new file mode 100644 > index 000000000000..d07f9a30ad85 > --- /dev/null > +++ > b/patches/open62541-1.2/0001-CMake-Allow-UA_NODESET_DIR-to-be-custom-defined.patch > @@ -0,0 +1,144 @@ > +From 3b0511e0e85700a8623ab6d0e1a6f8df42bc1c16 Mon Sep 17 00:00:00 2001 > +From: Sascha Hauer <s.ha...@pengutronix.de> > +Date: Wed, 3 Mar 2021 10:46:28 +0100 > +Subject: [PATCH] CMake: Allow UA_NODESET_DIR to be custom defined. > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +This makes it easier for developers to keep all ua-nodesets XML > +definitions in a common location. > + > +Backported from: https://github.com/open62541/open62541/pull/3310 > + > +Signed-off-by: Björn Esser <b.es...@pengutronix.de> > +--- > + CMakeLists.txt | 6 +++++- > + doc/nodeset_compiler.rst | 22 +++++++++++----------- > + examples/CMakeLists.txt | 4 ---- > + tools/cmake/macros_public.cmake | 2 +- > + 4 files changed, 17 insertions(+), 17 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index d09a77a6..87338eb8 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -15,7 +15,6 @@ include(GNUInstallDirs) > + > + # Set when installed via make install > + set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools) > +-set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset) > + set(XDP_LIBRARY "/usr/local/src/bpf-next/tools/lib/bpf/libbpf.a") > + > + include(macros_internal) > +@@ -160,6 +159,11 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL) > + set(UA_ENABLE_ENCRYPTION_MBEDTLS OFF) > + endif() > + > ++if(NOT UA_NODESET_DIR) > ++ set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset) > ++endif() > ++set(open62541_NODESET_DIR ${UA_NODESET_DIR}) > ++ > + # Namespace Zero > + set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated > namespace zero (minimal/reduced/full)") > + SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED" > "FULL") > +diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst > +index 730eda80..ea110d40 100644 > +--- a/doc/nodeset_compiler.rst > ++++ b/doc/nodeset_compiler.rst > +@@ -292,17 +292,17 @@ Here are some examples for the ``DI`` and ``PLCOpen`` > nodesets:: > + # Generate types and namespace for DI > + ua_generate_nodeset_and_datatypes( > + NAME "di" > +- FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv" > +- FILE_BSD > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd" > ++ FILE_CSV "${UA_NODESET_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv" > ++ FILE_BSD "${UA_NODESET_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd" > + NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"; > +- FILE_NS > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml" > ++ FILE_NS > "${UA_NODESET_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml" > + ) > + > + # generate PLCopen namespace which is using DI > + ua_generate_nodeset_and_datatypes( > + NAME "plc" > + # PLCopen does not define custom types. Only generate the nodeset > +- FILE_NS > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/PLCopen/Opc.Ua.Plc.NodeSet2.xml" > ++ FILE_NS "${UA_NODESET_DIR}/PLCopen/Opc.Ua.Plc.NodeSet2.xml" > + # PLCopen depends on the di nodeset, which must be generated before > + DEPENDS "di" > + ) > +@@ -401,8 +401,8 @@ This DI nodeset makes use of some additional data types > in ``deps/ua-nodeset/DI/ > + NAME "ua_types_di" > + TARGET_SUFFIX "types-di" > + NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"; > +- FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv" > +- FILES_BSD > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd" > ++ FILE_CSV "${UA_NODESET_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv" > ++ FILES_BSD "${UA_NODESET_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd" > + ) > + > + The ``NAMESPACE_MAP`` parameter is an array of strings which indicates the > mapping of specific namespace uris to the resulting namespace index. > +@@ -414,11 +414,11 @@ Now you can compile the DI nodeset XML using the > following command:: > + > + ua_generate_nodeset( > + NAME "di" > +- FILE > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml" > ++ FILE "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" > + TYPES_ARRAY "UA_TYPES_DI" > + INTERNAL > + DEPENDS_TYPES "UA_TYPES" > +- DEPENDS_NS > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml" > ++ DEPENDS_NS "${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml" > + DEPENDS_TARGET "open62541-generator-types-di" > + ) > + > +@@ -429,13 +429,13 @@ Next we can generate the PLCopen nodeset. Since it > doesn't require any additiona > + > + ua_generate_nodeset( > + NAME "plc" > +- FILE > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/PLCopen/Opc.Ua.Plc.NodeSet2.xml" > ++ FILE "${UA_NODESET_DIR}/PLCopen/Opc.Ua.Plc.NodeSet2.xml" > + INTERNAL > + DEPENDS_TYPES > + "UA_TYPES" "UA_TYPES_DI" > + DEPENDS_NS > +- > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml" > +- > "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml" > ++ "${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml" > ++ "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" > + DEPENDS_TARGET "open62541-generator-ns-di" > + ) > + > +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt > +index 70c84560..b589dec3 100644 > +--- a/examples/CMakeLists.txt > ++++ b/examples/CMakeLists.txt > +@@ -26,10 +26,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) > + set(UA_TOOLS_DIR ${open62541_TOOLS_DIR}) > + endif() > + > +- if(NOT UA_NODESET_DIR) > +- set(UA_NODESET_DIR ${open62541_NODESET_DIR}) > +- endif() > +- > + function(assign_source_group) > + # define empty function. We don't need it in standalone > + endfunction(assign_source_group) > +diff --git a/tools/cmake/macros_public.cmake > b/tools/cmake/macros_public.cmake > +index 95414e3d..4172392f 100644 > +--- a/tools/cmake/macros_public.cmake > ++++ b/tools/cmake/macros_public.cmake > +@@ -97,7 +97,7 @@ endfunction() > + # passed which will all combined to one resulting code. > + # IMPORT_BSD Combination of types array and path to the .bsd file > containing additional type definitions referenced by > + # the FILES_BSD files. The value is separated with a hash > sign, i.e. > +-# > 'UA_TYPES#${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd' > ++# 'UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd' > + # Multiple files can be passed which will all be imported. > + # [FILES_SELECTED] Optional path to a simple text file which contains a > list of types which should be included in the generation. > + # The file should contain one type per line. Multiple > files can be passed to this argument. > +-- > +2.29.2 > + > diff --git a/patches/open62541-1.0/series b/patches/open62541-1.2/series > similarity index 100% > rename from patches/open62541-1.0/series > rename to patches/open62541-1.2/series > diff --git a/rules/open62541.make b/rules/open62541.make > index 9efc9617a4e6..ac2b588294ca 100644 > --- a/rules/open62541.make > +++ b/rules/open62541.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPEN62541) += open62541 > # > # Paths and names > # > -OPEN62541_VERSION := 1.0 > -OPEN62541_MD5 := b8e02d7310e8b48faf52efc539fa9496 > +OPEN62541_VERSION := 1.2 > +OPEN62541_MD5 := 90034b0cf1714f9bf1d94ec2b17f3086 > OPEN62541 := open62541-$(OPEN62541_VERSION) > OPEN62541_SUFFIX := tar.gz > OPEN62541_URL := > https://github.com/open62541/open62541/archive/v$(OPEN62541_VERSION)/$(OPEN62541).$(OPEN62541_SUFFIX) > @@ -25,8 +25,8 @@ OPEN62541_DIR := > $(BUILDDIR)/$(OPEN62541) > OPEN62541_LICENSE := MPL-2.0 > OPEN62541_LICENSE_FILES := > file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad > > -OPEN62541_MDNSD_VERSION := > 4bd993e0fdd06d54c8fd0b8f416cda6a8db18585 > -OPEN62541_MDNSD_MD5 := 0961fc8dc253753ec8ea157104671498 > +OPEN62541_MDNSD_VERSION := > 3151afe5899dba5125dffa9f4cf3ae1fe2edc0f0 > +OPEN62541_MDNSD_MD5 := 75c45c7913b33f92a7be460bce593991 > OPEN62541_MDNSD := > open62541-mdnsd-$(OPEN62541_MDNSD_VERSION) > OPEN62541_MDNSD_SUFFIX := tar.gz > OPEN62541_MDNSD_URL := > https://github.com/Pro/mdnsd/archive/$(OPEN62541_MDNSD_VERSION)/$(OPEN62541_MDNSD).$(OPEN62541_MDNSD_SUFFIX) _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
