Skip to contentSkip to conversation

libyang: update from 2.0.7 to 2.0.164

PATCH New Randy MacLeod 1 participant 1 message Mar 19, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libyang: update from 2.0.7 to 2.0.164

Modify the patch since the removal of pcre2-config is no long needed as upstream now does:
75518cf7 cmake FEATURE read pcre2 version from header
and created an upstream PR as per new Upstream-Status.

The flag for building the test code was changed from ENABLE_BUILD_TESTS to just ENABLE_TESTS in:
cdffdabb build REFACTOR rename test option to unify with other projects

---
 .../libyang/libyang-add-stdint-h.patch        | 35 ++++++++++++
 ...byang-skip-pcre2-config-add-stdint-h.patch | 55 -------------------
 .../{libyang_2.0.7.bb => libyang_2.0.164.bb}  |  7 ++-
 3 files changed, 39 insertions(+), 58 deletions(-)
 create mode 100644 meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch
 delete mode 100644 meta-oe/recipes-extended/libyang/libyang/libyang-skip-pcre2-config-add-stdint-h.patch
 rename meta-oe/recipes-extended/libyang/{libyang_2.0.7.bb => libyang_2.0.164.bb} (85%)
meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch new file +35 -0
new file mode 100644
index 000000000..d35741114
@@ -0,0 +1,35 @@
+From c7f3e2a8fe530beec6103cb9071ccc41458879aa Mon Sep 17 00:00:00 2001
+From: Tony Tascioglu <[email protected]>
+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 <[email protected]>
+Signed-off-by: Randy MacLeod <[email protected]>
+---
+ 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 <stdarg.h>
+ #include <stddef.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ 
+ #include <cmocka.h>
+ 
+-- 
+2.32.0
meta-oe/recipes-extended/libyang/libyang/libyang-skip-pcre2-config-add-stdint-h.patch deleted +0 -55

55 lines not on this page · raw message

meta-oe/recipes-extended/libyang/libyang_2.0.164.bb renamed from meta-oe/recipes-extended/libyang/libyang_2.0.7.bb +4 -3
similarity index 85%
rename from meta-oe/recipes-extended/libyang/libyang_2.0.7.bb
rename to meta-oe/recipes-extended/libyang/libyang_2.0.164.bb
index 2f5e4615f..8f41769e0 100644
@@ -6,15 +6,16 @@ LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad"
 
-SRCREV = "69d9fff65abb58beb0bb6aa9ecacd572ca1dfc56"
+SRCREV = "a0cc89516ab5eca84d01c85309f320a94752a64c"
 
 SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \
-           file://libyang-skip-pcre2-config-add-stdint-h.patch \
+           file://libyang-add-stdint-h.patch \
            file://run-ptest \
            "
 
 S = "${WORKDIR}/git"
 
+# Due to valgrind not supported on these arches:
 COMPATIBLE_HOST:riscv32 = "null"
 COMPATIBLE_HOST:armv5 = "null"
 COMPATIBLE_HOST:riscv64 = "null"
@@ -29,7 +30,7 @@ BINCONFIG = "${bindir}/pcre2-config"
 RDEPENDS:${PN}-ptest += "valgrind"
 
 EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release"
-EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_BUILD_TESTS=ON', '', d)}"
+EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON', '', d)}"
 
 do_install_ptest () {
     cp -fR ${B}/tests/ ${D}${PTEST_PATH}/
Signature · 1 line
2.31.1