Message ID | 20240306154151.3741709-22-alex@linutronix.de |
---|---|
State | Accepted, archived |
Commit | a14769d40bee751ac1dcd536789e8e346046e141 |
Headers | show |
Series | [01/47] python3-sphinxcontrib-jquery: add a recipe and make python3-sphinx-rtd-theme depend on it | expand |
libosinfo fails due to this upgrade https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3691/steps/14/logs/stdio On Wed, Mar 6, 2024 at 7:42 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > License-Update: hash.c is rewritten and no longer carries a special copyright notice, but dict.c still does > (Copyright file updated to reflect that) > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > meta/recipes-core/libxml/libxml2/install-tests.patch | 9 ++++----- > .../libxml/{libxml2_2.11.5.bb => libxml2_2.12.5.bb} | 9 +++++---- > 2 files changed, 9 insertions(+), 9 deletions(-) > rename meta/recipes-core/libxml/{libxml2_2.11.5.bb => libxml2_2.12.5.bb} (92%) > > diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch > index 14ccce5873b..478eeea81b1 100644 > --- a/meta/recipes-core/libxml/libxml2/install-tests.patch > +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch > @@ -1,4 +1,4 @@ > -From 3fc716357ce1372d9418dc86f24315b34d9808de Mon Sep 17 00:00:00 2001 > +From 0779511838a8cbd1e0f431c22f28f286a2a37b1b Mon Sep 17 00:00:00 2001 > From: Ross Burton <ross.burton@arm.com> > Date: Mon, 5 Dec 2022 17:02:32 +0000 > Subject: [PATCH] add yocto-specific install-ptest target > @@ -7,17 +7,16 @@ Add a target to install the test suite. > > Upstream-Status: Inappropriate > Signed-off-by: Ross Burton <ross.burton@arm.com> > - > --- > Makefile.am | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/Makefile.am b/Makefile.am > -index 5bc4018..57d27af 100644 > +index 0a49d37..1097c63 100644 > --- a/Makefile.am > +++ b/Makefile.am > -@@ -26,6 +26,16 @@ check_PROGRAMS = \ > - testlimits \ > +@@ -27,6 +27,16 @@ check_PROGRAMS = \ > + testparser \ > testrecurse > > +ptestdir=$(libexecdir) > diff --git a/meta/recipes-core/libxml/libxml2_2.11.5.bb b/meta/recipes-core/libxml/libxml2_2.12.5.bb > similarity index 92% > rename from meta/recipes-core/libxml/libxml2_2.11.5.bb > rename to meta/recipes-core/libxml/libxml2_2.12.5.bb > index 44336c25e1c..47c1a72e77e 100644 > --- a/meta/recipes-core/libxml/libxml2_2.11.5.bb > +++ b/meta/recipes-core/libxml/libxml2_2.12.5.bb > @@ -4,10 +4,11 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libxml2" > BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" > SECTION = "libs" > LICENSE = "MIT" > -LIC_FILES_CHKSUM = "file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \ > - file://hash.c;beginline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879 \ > +LIC_FILES_CHKSUM = "file://Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \ > + file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \ > file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \ > - file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f" > + file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f \ > + " > > DEPENDS = "zlib virtual/libiconv" > > @@ -19,7 +20,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt > file://install-tests.patch \ > " > > -SRC_URI[archive.sha256sum] = "3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6" > +SRC_URI[archive.sha256sum] = "a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21" > SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" > > # Disputed as a security issue, but fixed in d39f780 > -- > 2.39.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#196704): https://lists.openembedded.org/g/openembedded-core/message/196704 > Mute This Topic: https://lists.openembedded.org/mt/104767962/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch index 14ccce5873b..478eeea81b1 100644 --- a/meta/recipes-core/libxml/libxml2/install-tests.patch +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch @@ -1,4 +1,4 @@ -From 3fc716357ce1372d9418dc86f24315b34d9808de Mon Sep 17 00:00:00 2001 +From 0779511838a8cbd1e0f431c22f28f286a2a37b1b Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> Date: Mon, 5 Dec 2022 17:02:32 +0000 Subject: [PATCH] add yocto-specific install-ptest target @@ -7,17 +7,16 @@ Add a target to install the test suite. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@arm.com> - --- Makefile.am | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 5bc4018..57d27af 100644 +index 0a49d37..1097c63 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -26,6 +26,16 @@ check_PROGRAMS = \ - testlimits \ +@@ -27,6 +27,16 @@ check_PROGRAMS = \ + testparser \ testrecurse +ptestdir=$(libexecdir) diff --git a/meta/recipes-core/libxml/libxml2_2.11.5.bb b/meta/recipes-core/libxml/libxml2_2.12.5.bb similarity index 92% rename from meta/recipes-core/libxml/libxml2_2.11.5.bb rename to meta/recipes-core/libxml/libxml2_2.12.5.bb index 44336c25e1c..47c1a72e77e 100644 --- a/meta/recipes-core/libxml/libxml2_2.11.5.bb +++ b/meta/recipes-core/libxml/libxml2_2.12.5.bb @@ -4,10 +4,11 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libxml2" BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \ - file://hash.c;beginline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879 \ +LIC_FILES_CHKSUM = "file://Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \ + file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \ file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \ - file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f" + file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f \ + " DEPENDS = "zlib virtual/libiconv" @@ -19,7 +20,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://install-tests.patch \ " -SRC_URI[archive.sha256sum] = "3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6" +SRC_URI[archive.sha256sum] = "a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21" SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" # Disputed as a security issue, but fixed in d39f780
License-Update: hash.c is rewritten and no longer carries a special copyright notice, but dict.c still does (Copyright file updated to reflect that) Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/recipes-core/libxml/libxml2/install-tests.patch | 9 ++++----- .../libxml/{libxml2_2.11.5.bb => libxml2_2.12.5.bb} | 9 +++++---- 2 files changed, 9 insertions(+), 9 deletions(-) rename meta/recipes-core/libxml/{libxml2_2.11.5.bb => libxml2_2.12.5.bb} (92%)