summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2023-03-08 21:49:22 +0800
committerKhem Raj <raj.khem@gmail.com>2023-03-08 07:12:23 -0800
commitaff811bf9ed1503a68343b1b423761a220310293 (patch)
treef7496bee7597fe522589fd9dc3e45260e67fd966
parentea17a1bcffbac531702cb4b85d7f1c4bb010614a (diff)
downloadmeta-openembedded-aff811bf9ed1503a68343b1b423761a220310293.tar.gz
libyang: upgrade 2.0.194 -> 2.1.30
* Drop local patch that has been merged upstream. * Update ptest cases list. Ptest Result: $ ptest-runner libyang START: ptest-runner 2023-03-08T08:25 BEGIN: /usr/lib/libyang/ptest PASS: utest_binary PASS: utest_bits PASS: utest_boolean PASS: utest_common PASS: utest_decimal64 PASS: utest_diff PASS: utest_empty PASS: utest_enumeration PASS: utest_hash_table PASS: utest_identityref PASS: utest_inet_types PASS: utest_inout PASS: utest_instanceid PASS: utest_instanceid_keys PASS: utest_int16 PASS: utest_int32 PASS: utest_int64 PASS: utest_int8 PASS: utest_json PASS: utest_leafref PASS: utest_list PASS: utest_lyb PASS: utest_merge PASS: utest_metadata PASS: utest_nacm PASS: utest_new PASS: utest_parser_json PASS: utest_parser_xml PASS: utest_pattern PASS: utest_printer_tree PASS: utest_printer_xml PASS: utest_plugins PASS: utest_range PASS: utest_schema PASS: utest_schema_mount PASS: utest_set PASS: utest_string PASS: utest_structure PASS: utest_tree_data PASS: utest_tree_schema_compile PASS: utest_uint16 PASS: utest_uint32 PASS: utest_uint64 PASS: utest_uint8 PASS: utest_union PASS: utest_validation PASS: utest_xml PASS: utest_xpath PASS: utest_yang PASS: utest_yangdata PASS: utest_yang_types PASS: utest_yanglib PASS: utest_yin DURATION: 11 END: /usr/lib/libyang/ptest 2023-03-08T08:26 STOP: ptest-runner TOTAL: 1 FAIL: 0 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch35
-rw-r--r--meta-oe/recipes-extended/libyang/libyang/run-ptest10
-rw-r--r--meta-oe/recipes-extended/libyang/libyang_2.1.30.bb (renamed from meta-oe/recipes-extended/libyang/libyang_2.0.194.bb)5
3 files changed, 8 insertions, 42 deletions
diff --git a/meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch b/meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch
deleted file mode 100644
index d357411146..0000000000
--- a/meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From c7f3e2a8fe530beec6103cb9071ccc41458879aa Mon Sep 17 00:00:00 2001
2From: Tony Tascioglu <tony.tascioglu@windriver.com>
3Date: Mon, 21 Jun 2021 12:34:22 -0400
4Subject: [PATCH] libyang: fix initial build errors
5
6This patch addresses build errors seen when integrating libyang as a
7recipe.
8
9There is a missing include statement for stdint.h in utests.h which
10causes build problems. stdint.h is required to be imported by cmocka.h
11prior to the cmocka file. Adding the stdint allows it to build the
12tests correctly
13
14Upstream-Status: Submitted [ https://github.com/CESNET/libyang/pull/1819 ]
15
16Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com>
17Signed-off-by: Randy MacLeod <randy.macleod@windriver.com>
18---
19 tests/utests/utests.h | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/tests/utests/utests.h b/tests/utests/utests.h
23index 7e85a66e..8eee26ce 100644
24--- a/tests/utests/utests.h
25+++ b/tests/utests/utests.h
26@@ -22,6 +22,7 @@
27 #include <stdarg.h>
28 #include <stddef.h>
29 #include <stdlib.h>
30+#include <stdint.h>
31
32 #include <cmocka.h>
33
34--
352.32.0
diff --git a/meta-oe/recipes-extended/libyang/libyang/run-ptest b/meta-oe/recipes-extended/libyang/libyang/run-ptest
index 4517725b49..9682540e26 100644
--- a/meta-oe/recipes-extended/libyang/libyang/run-ptest
+++ b/meta-oe/recipes-extended/libyang/libyang/run-ptest
@@ -13,6 +13,7 @@ tests="utest_binary \
13 utest_inet_types \ 13 utest_inet_types \
14 utest_inout \ 14 utest_inout \
15 utest_instanceid \ 15 utest_instanceid \
16 utest_instanceid_keys \
16 utest_int16 \ 17 utest_int16 \
17 utest_int32 \ 18 utest_int32 \
18 utest_int64 \ 19 utest_int64 \
@@ -27,19 +28,16 @@ tests="utest_binary \
27 utest_new \ 28 utest_new \
28 utest_parser_json \ 29 utest_parser_json \
29 utest_parser_xml \ 30 utest_parser_xml \
30 utest_parser_yang \
31 utest_parser_yin \
32 utest_pattern \ 31 utest_pattern \
33 utest_printer_tree \ 32 utest_printer_tree \
34 utest_printer_xml \ 33 utest_printer_xml \
35 utest_printer_yang \
36 utest_printer_yin \
37 utest_plugins \ 34 utest_plugins \
38 utest_range \ 35 utest_range \
39 utest_schema \ 36 utest_schema \
40 utest_schema_mount \ 37 utest_schema_mount \
41 utest_set \ 38 utest_set \
42 utest_string \ 39 utest_string \
40 utest_structure \
43 utest_tree_data \ 41 utest_tree_data \
44 utest_tree_schema_compile \ 42 utest_tree_schema_compile \
45 utest_uint16 \ 43 utest_uint16 \
@@ -50,9 +48,11 @@ tests="utest_binary \
50 utest_validation \ 48 utest_validation \
51 utest_xml \ 49 utest_xml \
52 utest_xpath \ 50 utest_xpath \
51 utest_yang \
53 utest_yangdata \ 52 utest_yangdata \
54 utest_yang_types \ 53 utest_yang_types \
55 utest_yanglib" 54 utest_yanglib \
55 utest_yin"
56 56
57# cd into right directory 57# cd into right directory
58ptestdir=$(dirname "$(readlink -f "$0")") 58ptestdir=$(dirname "$(readlink -f "$0")")
diff --git a/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb b/meta-oe/recipes-extended/libyang/libyang_2.1.30.bb
index 16630a7150..5adfc1d80b 100644
--- a/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb
+++ b/meta-oe/recipes-extended/libyang/libyang_2.1.30.bb
@@ -6,10 +6,9 @@ LICENSE = "BSD-3-Clause"
6 6
7LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad"
8 8
9SRCREV = "87375f15159545a87a1e0de200f5d9d67e9091d7" 9SRCREV = "35131b9396a965e01f899127763fb4e0871b845a"
10 10
11SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ 11SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \
12 file://libyang-add-stdint-h.patch \
13 file://run-ptest \ 12 file://run-ptest \
14 " 13 "
15 14
@@ -37,3 +36,5 @@ do_install_ptest () {
37 install -d ${D}${PTEST_PATH}/tests/plugins 36 install -d ${D}${PTEST_PATH}/tests/plugins
38 cp -f ${B}/tests/plugins/plugin_*.so ${D}${PTEST_PATH}/tests/plugins/ 37 cp -f ${B}/tests/plugins/plugin_*.so ${D}${PTEST_PATH}/tests/plugins/
39} 38}
39
40FILES:${PN} += "${datadir}/yang/*"