| Message ID | 20250319125952.646746-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | Accepted, archived |
| Commit | c9d3a47a19babfe88f0174233729394292a31726 |
| Headers | show |
| Series | [v2] libmatchbox: Upgrade 1.12 -> 1.13 | expand |
On Wed, Mar 19, 2025 at 12:59:52PM +0000, Richard Purdie wrote: > This includes fixes for gcc 15. > > License fixes were also made in the repository. The license being referred to > as MIT was in fact HPND so fix the LICENSE on the recipe accordingly. > > Use the new bitbake tag functionality to verify the commit matches the tagged > version. > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > .../{libmatchbox_1.12.bb => libmatchbox_1.13.bb} | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > rename meta/recipes-graphics/libmatchbox/{libmatchbox_1.12.bb => libmatchbox_1.13.bb} (91%) > > diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb > similarity index 91% > rename from meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb > rename to meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb > index bf3f5c005d9..6ee30097542 100644 > --- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb > +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb > @@ -7,7 +7,7 @@ SECTION = "x11/libs" > HOMEPAGE = "http://matchbox-project.org/" > BUGTRACKER = "http://bugzilla.yoctoproject.com/" > > -LICENSE = "LGPL-2.0-or-later & MIT" > +LICENSE = "LGPL-2.0-or-later & HPND" > LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ > file://COPYING.MIT;md5=f45ed9332b4f50a35adf2065adde4ca7 \ > file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \ > @@ -15,9 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ > > DEPENDS = "virtual/libx11 libxext" > > -#SRCREV for 1.12 > -SRCREV = "e846ee434f8e23d9db38af13c523f791495e0e87" > -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https" > +SRCREV = "5cd78efa3120efc46497f55c04382be960d1864" > +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https;tag=${PV}" This breaks with: Parsing recipes...WARNING: /home/lumag/Projects/RPB/build-rpb/conf/../../layers/openembedded-core/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb: Exception during build_dependencies for fetcher_hashes_dummyfunc WARNING: /home/lumag/Projects/RPB/build-rpb/conf/../../layers/openembedded-core/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb: Error during finalise of /home/lumag/Projects/RPB/build-rpb/conf/../../layers/openembedded-core/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb ERROR: ExpansionError during parsing /home/lumag/Projects/RPB/build-rpb/conf/../../layers/openembedded-core/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb bb.data_smart.ExpansionError: Failure expanding variable fetcher_hashes_dummyfunc[vardepvalue], expression was ${@bb.fetch.get_hashvalue(d)} which triggered exception FetchError: Fetcher failure: Conflicting revisions (35cd78efa3120efc46497f55c04382be960d1864 from SRCREV and 1.13 from the url) found, please specify one valid value The variable dependency chain for the failure is: fetcher_hashes_dummyfunc[vardepvalue] > > S = "${WORKDIR}/git" > >
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb similarity index 91% rename from meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb rename to meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb index bf3f5c005d9..6ee30097542 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb @@ -7,7 +7,7 @@ SECTION = "x11/libs" HOMEPAGE = "http://matchbox-project.org/" BUGTRACKER = "http://bugzilla.yoctoproject.com/" -LICENSE = "LGPL-2.0-or-later & MIT" +LICENSE = "LGPL-2.0-or-later & HPND" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ file://COPYING.MIT;md5=f45ed9332b4f50a35adf2065adde4ca7 \ file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \ @@ -15,9 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ DEPENDS = "virtual/libx11 libxext" -#SRCREV for 1.12 -SRCREV = "e846ee434f8e23d9db38af13c523f791495e0e87" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https" +SRCREV = "5cd78efa3120efc46497f55c04382be960d1864" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https;tag=${PV}" S = "${WORKDIR}/git"
This includes fixes for gcc 15. License fixes were also made in the repository. The license being referred to as MIT was in fact HPND so fix the LICENSE on the recipe accordingly. Use the new bitbake tag functionality to verify the commit matches the tagged version. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- .../{libmatchbox_1.12.bb => libmatchbox_1.13.bb} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename meta/recipes-graphics/libmatchbox/{libmatchbox_1.12.bb => libmatchbox_1.13.bb} (91%)