From aff811bf9ed1503a68343b1b423761a220310293 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 8 Mar 2023 21:49:22 +0800 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- .../libyang/libyang-add-stdint-h.patch | 35 ------------------- .../libyang/libyang/run-ptest | 10 +++--- .../{libyang_2.0.194.bb => libyang_2.1.30.bb} | 5 +-- 3 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch rename meta-oe/recipes-extended/libyang/{libyang_2.0.194.bb => libyang_2.1.30.bb} (92%) 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 @@ -From c7f3e2a8fe530beec6103cb9071ccc41458879aa Mon Sep 17 00:00:00 2001 -From: Tony Tascioglu -Date: Mon, 21 Jun 2021 12:34:22 -0400 -Subject: [PATCH] libyang: fix initial build errors - -This patch addresses build errors seen when integrating libyang as a -recipe. - -There is a missing include statement for stdint.h in utests.h which -causes build problems. stdint.h is required to be imported by cmocka.h -prior to the cmocka file. Adding the stdint allows it to build the -tests correctly - -Upstream-Status: Submitted [ https://github.com/CESNET/libyang/pull/1819 ] - -Signed-off-by: Tony Tascioglu -Signed-off-by: Randy MacLeod ---- - tests/utests/utests.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/utests/utests.h b/tests/utests/utests.h -index 7e85a66e..8eee26ce 100644 ---- a/tests/utests/utests.h -+++ b/tests/utests/utests.h -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - --- -2.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 \ utest_inet_types \ utest_inout \ utest_instanceid \ + utest_instanceid_keys \ utest_int16 \ utest_int32 \ utest_int64 \ @@ -27,19 +28,16 @@ tests="utest_binary \ utest_new \ utest_parser_json \ utest_parser_xml \ - utest_parser_yang \ - utest_parser_yin \ utest_pattern \ utest_printer_tree \ utest_printer_xml \ - utest_printer_yang \ - utest_printer_yin \ utest_plugins \ utest_range \ utest_schema \ utest_schema_mount \ utest_set \ utest_string \ + utest_structure \ utest_tree_data \ utest_tree_schema_compile \ utest_uint16 \ @@ -50,9 +48,11 @@ tests="utest_binary \ utest_validation \ utest_xml \ utest_xpath \ + utest_yang \ utest_yangdata \ utest_yang_types \ - utest_yanglib" + utest_yanglib \ + utest_yin" # cd into right directory ptestdir=$(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 similarity index 92% rename from meta-oe/recipes-extended/libyang/libyang_2.0.194.bb rename to 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" LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" -SRCREV = "87375f15159545a87a1e0de200f5d9d67e9091d7" +SRCREV = "35131b9396a965e01f899127763fb4e0871b845a" SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ - file://libyang-add-stdint-h.patch \ file://run-ptest \ " @@ -37,3 +36,5 @@ do_install_ptest () { install -d ${D}${PTEST_PATH}/tests/plugins cp -f ${B}/tests/plugins/plugin_*.so ${D}${PTEST_PATH}/tests/plugins/ } + +FILES:${PN} += "${datadir}/yang/*"