From 2a432d02d3b67aaed97ffbece88c09d89761da11 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 23 Oct 2023 16:21:32 +0800 Subject: libyang: upgrade 2.1.111 -> 2.1.128 Changelog: =========== revert of identityref canonical value change the identity always printed with the module name as the prefix data tree and hash table optimizations opaque node handling fixes and improvements lots of other bug fixes Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit c6617ceefacd6af2416dc903320c3ea5fe62b81c) Signed-off-by: Armin Kuster --- .../recipes-extended/libyang/libyang_2.1.111.bb | 45 ---------------------- .../recipes-extended/libyang/libyang_2.1.128.bb | 45 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-extended/libyang/libyang_2.1.111.bb create mode 100644 meta-oe/recipes-extended/libyang/libyang_2.1.128.bb diff --git a/meta-oe/recipes-extended/libyang/libyang_2.1.111.bb b/meta-oe/recipes-extended/libyang/libyang_2.1.111.bb deleted file mode 100644 index e59235690a..0000000000 --- a/meta-oe/recipes-extended/libyang/libyang_2.1.111.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "YANG data modeling language library" -DESCRIPTION = "libyang is a YANG data modelling language parser and toolkit written (and providing API) in C." -HOMEPAGE = "https://github.com/CESNET/libyang" -SECTION = "libs" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" - -SRCREV = "8b0b910a2dcb7360cb5b0aaefbd1338271d50946" - -SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ - file://0001-test_context-skip-test-case-test_searchdirs.patch \ - file://run-ptest \ - " - -S = "${WORKDIR}/git" - -# Main dependencies -inherit cmake pkgconfig lib_package ptest multilib_header -DEPENDS = "libpcre2" -DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" - -EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" -EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON -DENABLE_VALGRIND_TESTS=OFF', '', d)}" - -do_compile:prepend () { - if [ ${PTEST_ENABLED} = "1" ]; then - sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/tests/tests_config.h - sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/tests/tests_config.h - fi -} - -do_install:append () { - oe_multilib_header libyang/config.h -} - -do_install_ptest () { - install -d ${D}${PTEST_PATH}/tests - cp -f ${B}/tests/utest_* ${D}${PTEST_PATH}/tests/ - cp -fR ${S}/tests/modules ${D}${PTEST_PATH}/tests/ - install -d ${D}${PTEST_PATH}/tests/plugins - cp -f ${B}/tests/plugins/plugin_*.so ${D}${PTEST_PATH}/tests/plugins/ -} - -FILES:${PN} += "${datadir}/yang/*" diff --git a/meta-oe/recipes-extended/libyang/libyang_2.1.128.bb b/meta-oe/recipes-extended/libyang/libyang_2.1.128.bb new file mode 100644 index 0000000000..55dbb82029 --- /dev/null +++ b/meta-oe/recipes-extended/libyang/libyang_2.1.128.bb @@ -0,0 +1,45 @@ +SUMMARY = "YANG data modeling language library" +DESCRIPTION = "libyang is a YANG data modelling language parser and toolkit written (and providing API) in C." +HOMEPAGE = "https://github.com/CESNET/libyang" +SECTION = "libs" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" + +SRCREV = "7e5ea21030fe6632b6faad30c0de8d9669503773" + +SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ + file://0001-test_context-skip-test-case-test_searchdirs.patch \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +# Main dependencies +inherit cmake pkgconfig lib_package ptest multilib_header +DEPENDS = "libpcre2" +DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" +EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON -DENABLE_VALGRIND_TESTS=OFF', '', d)}" + +do_compile:prepend () { + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/tests/tests_config.h + sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/tests/tests_config.h + fi +} + +do_install:append () { + oe_multilib_header libyang/config.h +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -f ${B}/tests/utest_* ${D}${PTEST_PATH}/tests/ + cp -fR ${S}/tests/modules ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/plugins + cp -f ${B}/tests/plugins/plugin_*.so ${D}${PTEST_PATH}/tests/plugins/ +} + +FILES:${PN} += "${datadir}/yang/*" -- cgit v1.2.3-54-g00ecf