| Message ID | 20260702161521.84024-4-yunseong.kim@est.tech |
|---|---|
| State | Rejected, archived |
| Delegated to: | Anuj Mittal |
| Headers | show |
| Series | [meta-oe,scarthgap] libyang: upgrade 2.1.148 -> 3.13.6 | expand |
On Fri, Jul 3, 2026 at 1:40 AM Yunseong Kim <yunseong.kim@est.tech> wrote: > > Upgrade libyang to align with the version present in the wrynose. > > ChangeLog: > https://github.com/CESNET/libyang/releases/tag/v3.13.6 Why do we need to align the versions? This version also seems to be backward incompatible and that is not acceptable for stable branch. Thanks, Anuj > > * Add xxhash dependency. > * Update multilib header from config.h to ly_config.h. > * Refresh patch for new version. > > Signed-off-by: Yunseong Kim <yunseong.kim@est.tech> > --- > ...-test_context-skip-test-case-test_searchdirs.patch | 9 +++------ > .../libyang/{libyang_2.1.148.bb => libyang_3.13.6.bb} | 11 +++++++---- > 2 files changed, 10 insertions(+), 10 deletions(-) > rename meta-oe/recipes-extended/libyang/{libyang_2.1.148.bb => libyang_3.13.6.bb} (86%) > > diff --git a/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch > index 3c6aee9247..70890e2485 100644 > --- a/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch > +++ b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch > @@ -1,4 +1,4 @@ > -From 5de24e1b39c09adb0c5bf4bb4228bd1bb935542a Mon Sep 17 00:00:00 2001 > +From 24ec37bfe5c4c248dda0e80d6e7ab27afca1d60e Mon Sep 17 00:00:00 2001 > From: Yi Zhao <yi.zhao@windriver.com> > Date: Wed, 22 Mar 2023 16:03:56 +0800 > Subject: [PATCH] test_context: skip test case test_searchdirs > @@ -13,10 +13,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > 1 file changed, 1 deletion(-) > > diff --git a/tests/utests/basic/test_context.c b/tests/utests/basic/test_context.c > -index cfba1d30f..8c3bb7ad6 100644 > +index 116b2ce36..4e96f4e96 100644 > --- a/tests/utests/basic/test_context.c > +++ b/tests/utests/basic/test_context.c > -@@ -1061,7 +1061,6 @@ int > +@@ -1110,7 +1110,6 @@ int > main(void) > { > const struct CMUnitTest tests[] = { > @@ -24,6 +24,3 @@ index cfba1d30f..8c3bb7ad6 100644 > UTEST(test_options), > UTEST(test_models), > UTEST(test_imports), > --- > -2.25.1 > - > diff --git a/meta-oe/recipes-extended/libyang/libyang_2.1.148.bb b/meta-oe/recipes-extended/libyang/libyang_3.13.6.bb > similarity index 86% > rename from meta-oe/recipes-extended/libyang/libyang_2.1.148.bb > rename to meta-oe/recipes-extended/libyang/libyang_3.13.6.bb > index 0eff3247c6..8ea23990dd 100644 > --- a/meta-oe/recipes-extended/libyang/libyang_2.1.148.bb > +++ b/meta-oe/recipes-extended/libyang/libyang_3.13.6.bb > @@ -4,9 +4,9 @@ HOMEPAGE = "https://github.com/CESNET/libyang" > SECTION = "libs" > LICENSE = "BSD-3-Clause" > > -LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=b69fd3b2815bbf1cef5c97f0eee2519a" > > -SRCREV = "fc4dbd923e044006c93df020590a1e5a8656c09e" > +SRCREV = "c2ddd01b9b810a30d6a7d6749a3bc9adeb7b01fb" > > SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ > file://0001-test_context-skip-test-case-test_searchdirs.patch \ > @@ -17,7 +17,10 @@ S = "${WORKDIR}/git" > > # Main dependencies > inherit cmake pkgconfig lib_package ptest multilib_header > -DEPENDS = "libpcre2" > +DEPENDS = " \ > + libpcre2 \ > + xxhash \ > +" > DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" > > EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" > @@ -31,7 +34,7 @@ do_compile:prepend () { > } > > do_install:append () { > - oe_multilib_header libyang/config.h > + oe_multilib_header libyang/ly_config.h > } > > do_install_ptest () { > -- > 2.53.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#128002): https://lists.openembedded.org/g/openembedded-devel/message/128002 > Mute This Topic: https://lists.openembedded.org/mt/120087123/3616702 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [anuj.mittal@oss.qualcomm.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Hi Anuj, Thank you for your review. > On Fri, Jul 3, 2026 at 1:40 AM Yunseong Kim <yunseong.kim@est.tech> wrote: >> >> Upgrade libyang to align with the version present in the wrynose. >> >> ChangeLog: >> https://github.com/CESNET/libyang/releases/tag/v3.13.6 > > Why do we need to align the versions? This version also seems to be > backward incompatible and that is not acceptable for stable branch. I agree. I'll drop this patch. This patch was CVE handling on v2.1.148. I realized that after sending this patch that preparing a CVE patch set is a better approach than upgrading the version. > Thanks, > > Anuj > >> >> [snip...] Best regards, Yunseong
diff --git a/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch index 3c6aee9247..70890e2485 100644 --- a/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch +++ b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch @@ -1,4 +1,4 @@ -From 5de24e1b39c09adb0c5bf4bb4228bd1bb935542a Mon Sep 17 00:00:00 2001 +From 24ec37bfe5c4c248dda0e80d6e7ab27afca1d60e Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 22 Mar 2023 16:03:56 +0800 Subject: [PATCH] test_context: skip test case test_searchdirs @@ -13,10 +13,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 deletion(-) diff --git a/tests/utests/basic/test_context.c b/tests/utests/basic/test_context.c -index cfba1d30f..8c3bb7ad6 100644 +index 116b2ce36..4e96f4e96 100644 --- a/tests/utests/basic/test_context.c +++ b/tests/utests/basic/test_context.c -@@ -1061,7 +1061,6 @@ int +@@ -1110,7 +1110,6 @@ int main(void) { const struct CMUnitTest tests[] = { @@ -24,6 +24,3 @@ index cfba1d30f..8c3bb7ad6 100644 UTEST(test_options), UTEST(test_models), UTEST(test_imports), --- -2.25.1 - diff --git a/meta-oe/recipes-extended/libyang/libyang_2.1.148.bb b/meta-oe/recipes-extended/libyang/libyang_3.13.6.bb similarity index 86% rename from meta-oe/recipes-extended/libyang/libyang_2.1.148.bb rename to meta-oe/recipes-extended/libyang/libyang_3.13.6.bb index 0eff3247c6..8ea23990dd 100644 --- a/meta-oe/recipes-extended/libyang/libyang_2.1.148.bb +++ b/meta-oe/recipes-extended/libyang/libyang_3.13.6.bb @@ -4,9 +4,9 @@ HOMEPAGE = "https://github.com/CESNET/libyang" SECTION = "libs" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b69fd3b2815bbf1cef5c97f0eee2519a" -SRCREV = "fc4dbd923e044006c93df020590a1e5a8656c09e" +SRCREV = "c2ddd01b9b810a30d6a7d6749a3bc9adeb7b01fb" SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ file://0001-test_context-skip-test-case-test_searchdirs.patch \ @@ -17,7 +17,10 @@ S = "${WORKDIR}/git" # Main dependencies inherit cmake pkgconfig lib_package ptest multilib_header -DEPENDS = "libpcre2" +DEPENDS = " \ + libpcre2 \ + xxhash \ +" DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" @@ -31,7 +34,7 @@ do_compile:prepend () { } do_install:append () { - oe_multilib_header libyang/config.h + oe_multilib_header libyang/ly_config.h } do_install_ptest () {
Upgrade libyang to align with the version present in the wrynose. ChangeLog: https://github.com/CESNET/libyang/releases/tag/v3.13.6 * Add xxhash dependency. * Update multilib header from config.h to ly_config.h. * Refresh patch for new version. Signed-off-by: Yunseong Kim <yunseong.kim@est.tech> --- ...-test_context-skip-test-case-test_searchdirs.patch | 9 +++------ .../libyang/{libyang_2.1.148.bb => libyang_3.13.6.bb} | 11 +++++++---- 2 files changed, 10 insertions(+), 10 deletions(-) rename meta-oe/recipes-extended/libyang/{libyang_2.1.148.bb => libyang_3.13.6.bb} (86%)