summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb2
-rw-r--r--meta-oe/recipes-devtools/cereal/cereal/0001-add-license-files-for-components-of-cereal.patch99
-rw-r--r--meta-oe/recipes-devtools/cereal/cereal_1.3.0.bb36
3 files changed, 1 insertions, 136 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index ba85596995..94830e2970 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -961,7 +961,7 @@ RDEPENDS_packagegroup-meta-oe-fortran-packages = "\
961# nlohmann-json exprtk liblightmodbus p8platform gnome-doc-utils-stub 961# nlohmann-json exprtk liblightmodbus p8platform gnome-doc-utils-stub
962# glm ttf-mplus xbitmaps ceres-solver cli11 fftw gnulib libeigen ade 962# glm ttf-mplus xbitmaps ceres-solver cli11 fftw gnulib libeigen ade
963# spdlog span-lite uthash websocketpp catch2 properties-cpp cpp-netlib 963# spdlog span-lite uthash websocketpp catch2 properties-cpp cpp-netlib
964# cereal 964
965# rsyslog conflicts with syslog-ng so its not included here 965# rsyslog conflicts with syslog-ng so its not included here
966 966
967EXCLUDE_FROM_WORLD = "1" 967EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-oe/recipes-devtools/cereal/cereal/0001-add-license-files-for-components-of-cereal.patch b/meta-oe/recipes-devtools/cereal/cereal/0001-add-license-files-for-components-of-cereal.patch
deleted file mode 100644
index 0000ab9197..0000000000
--- a/meta-oe/recipes-devtools/cereal/cereal/0001-add-license-files-for-components-of-cereal.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1From 481b2aa46b3f54d9bee059d9da68263edece2bb3 Mon Sep 17 00:00:00 2001
2From: Adam Miartus <adam.miartus@softhows.eu>
3Date: Mon, 1 Feb 2021 16:15:01 +0100
4Subject: [PATCH] add license files for components of cereal
5
6Signed-off-by: Adam Miartus <adam.miartus@softhows.eu>
7---
8 include/cereal/external/LICENSE | 21 ++++++++++++++
9 include/cereal/external/rapidjson/LICENSE | 13 +++++++++
10 .../external/rapidjson/msinttypes/LICENSE | 29 +++++++++++++++++++
11 3 files changed, 63 insertions(+)
12 create mode 100644 include/cereal/external/LICENSE
13 create mode 100644 include/cereal/external/rapidjson/LICENSE
14 create mode 100644 include/cereal/external/rapidjson/msinttypes/LICENSE
15
16diff --git a/include/cereal/external/LICENSE b/include/cereal/external/LICENSE
17new file mode 100644
18index 00000000..66300b68
19--- /dev/null
20+++ b/include/cereal/external/LICENSE
21@@ -0,0 +1,21 @@
22+Copyright (C) 2004-2008 René Nyffenegger
23+
24+This source code is provided 'as-is', without any express or implied
25+warranty. In no event will the author be held liable for any damages
26+arising from the use of this software.
27+
28+Permission is granted to anyone to use this software for any purpose,
29+including commercial applications, and to alter it and redistribute it
30+freely, subject to the following restrictions:
31+
32+1. The origin of this source code must not be misrepresented; you must not
33+ claim that you wrote the original source code. If you use this source code
34+ in a product, an acknowledgment in the product documentation would be
35+ appreciated but is not required.
36+
37+2. Altered source versions must be plainly marked as such, and must not be
38+ misrepresented as being the original source code.
39+
40+3. This notice may not be removed or altered from any source distribution.
41+
42+René Nyffenegger rene.nyffenegger@adp-gmbh.ch
43diff --git a/include/cereal/external/rapidjson/LICENSE b/include/cereal/external/rapidjson/LICENSE
44new file mode 100644
45index 00000000..4546f15a
46--- /dev/null
47+++ b/include/cereal/external/rapidjson/LICENSE
48@@ -0,0 +1,13 @@
49+Tencent is pleased to support the open source community by making RapidJSON available.
50+
51+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
52+
53+Licensed under the MIT License (the "License"); you may not use this file except
54+in compliance with the License. You may obtain a copy of the License at
55+
56+http://opensource.org/licenses/MIT
57+
58+Unless required by applicable law or agreed to in writing, software distributed
59+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
60+CONDITIONS OF ANY KIND, either express or implied. See the License for the
61+specific language governing permissions and limitations under the License.
62diff --git a/include/cereal/external/rapidjson/msinttypes/LICENSE b/include/cereal/external/rapidjson/msinttypes/LICENSE
63new file mode 100644
64index 00000000..e3d96f8f
65--- /dev/null
66+++ b/include/cereal/external/rapidjson/msinttypes/LICENSE
67@@ -0,0 +1,29 @@
68+ISO C9x compliant stdint.h for Microsoft Visual Studio
69+Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
70+
71+ Copyright (c) 2006-2013 Alexander Chemeris
72+
73+Redistribution and use in source and binary forms, with or without
74+modification, are permitted provided that the following conditions are met:
75+
76+ 1. Redistributions of source code must retain the above copyright notice,
77+ this list of conditions and the following disclaimer.
78+
79+ 2. Redistributions in binary form must reproduce the above copyright
80+ notice, this list of conditions and the following disclaimer in the
81+ documentation and/or other materials provided with the distribution.
82+
83+ 3. Neither the name of the product nor the names of its contributors may
84+ be used to endorse or promote products derived from this software
85+ without specific prior written permission.
86+
87+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
88+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
89+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
90+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
91+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
92+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
93+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
94+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
95+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
96+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
97--
982.29.2
99
diff --git a/meta-oe/recipes-devtools/cereal/cereal_1.3.0.bb b/meta-oe/recipes-devtools/cereal/cereal_1.3.0.bb
deleted file mode 100644
index a4b7f3432a..0000000000
--- a/meta-oe/recipes-devtools/cereal/cereal_1.3.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
1SUMMARY = "cereal is a header-only C++11 serialization library"
2HOMEPAGE = "https://uscilab.github.io/cereal"
3LICENSE = "BSD & MIT & BSL-1.0"
4LIC_FILES_CHKSUM = "\
5 file://LICENSE;md5=e612690af2f575dfd02e2e91443cea23 \
6 file://include/cereal/external/rapidxml/license.txt;md5=d63ab70ba21ca0544b03284958324301 \
7 file://include/cereal/external/LICENSE;md5=b07578c9df99c0b8b45eb041efd4a645 \
8 file://include/cereal/external/rapidjson/LICENSE;md5=e7abb663111d4ac17cf00323698aff08 \
9 file://include/cereal/external/rapidjson/msinttypes/LICENSE;md5=dffce65b98c773976de2e338bd130f46 \
10"
11
12inherit cmake pkgconfig
13
14RDEPENDS_${PN}-dev = ""
15
16SRC_URI = " \
17 git://github.com/USCiLab/cereal.git;protocol=https \
18 file://0001-add-license-files-for-components-of-cereal.patch \
19"
20
21SRCREV = "02eace19a99ce3cd564ca4e379753d69af08c2c8"
22
23EXTRA_OECMAKE += "\
24 -DCEREAL_INSTALL=TRUE \
25 -DJUST_INSTALL_CEREAL=TRUE \
26"
27
28S = "${WORKDIR}/git"
29
30PROVIDES += "${PN}-dev"
31
32FILES_${PN}-dev = " \
33 ${includedir} \
34 ${libdir} \
35 ${datadir}/cmake \
36"