| Message ID | 20251030115415.2566247-1-dmitry.baryshkov@oss.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v4,1/2] libconfig: import recipe from meta-oe | expand |
On Thu Oct 30, 2025 at 12:54 PM CET, Dmitry Baryshkov via lists.openembedded.org wrote: > One of the freedreno tools in the Mesa package depends on libconfig. > Recipes from other layers also depend on libconfig. It makes sense to > move libconfig to OE-Core in order to reduce inter-layer dependencies. > > Changes between meta-oe and this recipe: > - Upgraded to 1.8.1 > - Switched to UPSTREAM_CHECK_GITTAGREGEX > - Switched from autotools-brokensep to autotools > - Added a patch fixing reproducibility issues > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> > --- Hi Dmitry, I still have to launch a full test session, but on the reproducibility side, it looks correct now: https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/2806 Thanks, Mathieu
On Thu, 30 Oct 2025 at 17:38, Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> wrote: > > On Thu Oct 30, 2025 at 12:54 PM CET, Dmitry Baryshkov via lists.openembedded.org wrote: > > One of the freedreno tools in the Mesa package depends on libconfig. > > Recipes from other layers also depend on libconfig. It makes sense to > > move libconfig to OE-Core in order to reduce inter-layer dependencies. > > > > Changes between meta-oe and this recipe: > > - Upgraded to 1.8.1 > > - Switched to UPSTREAM_CHECK_GITTAGREGEX > > - Switched from autotools-brokensep to autotools > > - Added a patch fixing reproducibility issues > > > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> > > --- > > Hi Dmitry, > > I still have to launch a full test session, but on the reproducibility > side, it looks correct now: > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/2806 Great, thanks!
On Thu, Oct 30, 2025 at 01:54:14PM +0200, Dmitry Baryshkov wrote: > One of the freedreno tools in the Mesa package depends on libconfig. > Recipes from other layers also depend on libconfig. It makes sense to > move libconfig to OE-Core in order to reduce inter-layer dependencies. > > Changes between meta-oe and this recipe: > - Upgraded to 1.8.1 > - Switched to UPSTREAM_CHECK_GITTAGREGEX > - Switched from autotools-brokensep to autotools > - Added a patch fixing reproducibility issues > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> > --- > meta/conf/distro/include/maintainers.inc | 1 + > ...Add-missing-dependency-for-scanner.h.patch | 33 +++++++++++++++++++ > .../libconfig/libconfig_1.8.1.bb | 30 +++++++++++++++++ > 3 files changed, 64 insertions(+) > create mode 100644 meta/recipes-extended/libconfig/libconfig/0001-Add-missing-dependency-for-scanner.h.patch > create mode 100644 meta/recipes-extended/libconfig/libconfig_1.8.1.bb > I see that these patches were a part of master-next and then were silently dropped. Could you please comment, why? Were there any remaining issues with them?
On Tue, 18 Nov 2025 at 13:21, Dmitry Baryshkov via lists.openembedded.org <dmitry.baryshkov=oss.qualcomm.com@lists.openembedded.org> wrote: > I see that these patches were a part of master-next and then were > silently dropped. Could you please comment, why? Were there any > remaining issues with them? We're deep into feature freeze, we're late, and struggling to get the release out. At this point new features like this really don't belong in master-next, but the patches are still in Mathieu's staging branch. If you want them to land in master sooner, help with resolving the remaining release blockers would be appreciated. See the weekly status report later today, and join the tech call in 3.5 hours. Alex
On Tue, 18 Nov 2025 at 14:32, Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > On Tue, 18 Nov 2025 at 13:21, Dmitry Baryshkov via > lists.openembedded.org > <dmitry.baryshkov=oss.qualcomm.com@lists.openembedded.org> wrote: > > I see that these patches were a part of master-next and then were > > silently dropped. Could you please comment, why? Were there any > > remaining issues with them? > > We're deep into feature freeze, we're late, and struggling to get the > release out. At this point new features like this really don't belong > in master-next, but the patches are still in Mathieu's staging branch. Alexander, thanks for the explanation. I was surprised by the lack of any emails regarding them > > If you want them to land in master sooner, help with resolving the > remaining release blockers would be appreciated. See the weekly status > report later today, and join the tech call in 3.5 hours. Sure :-)
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index c4142e2b7215..d4ec0ddcc852 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -329,6 +329,7 @@ RECIPE_MAINTAINER:pn-libcgroup = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-libcheck = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER:pn-libclc = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER:pn-libcomps = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER:pn-libconfig = "Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>" RECIPE_MAINTAINER:pn-libconvert-asn1-perl = "Tim Orling <tim.orling@konsulko.com>" RECIPE_MAINTAINER:pn-libcxx = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER:pn-libdaemon = "Unassigned <unassigned@yoctoproject.org>" diff --git a/meta/recipes-extended/libconfig/libconfig/0001-Add-missing-dependency-for-scanner.h.patch b/meta/recipes-extended/libconfig/libconfig/0001-Add-missing-dependency-for-scanner.h.patch new file mode 100644 index 000000000000..6e6a9419aeb1 --- /dev/null +++ b/meta/recipes-extended/libconfig/libconfig/0001-Add-missing-dependency-for-scanner.h.patch @@ -0,0 +1,33 @@ +From b9afffcee8809e47d0564f3d6376de724ae820ae Mon Sep 17 00:00:00 2001 +From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> +Date: Wed, 29 Oct 2025 22:26:16 +0200 +Subject: [PATCH] Add missing dependency for scanner.h + +Automake doesn't handle the header -> source dependency for lex +scanners. This might result in the out-of-date header or it not being +rebuilt in time. Provide a rule to make sure that the header is built +properly. + +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> +Upstream-Status: Submitted [https://github.com/hyperrealm/libconfig/pull/277] +--- + lib/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 9ef984323af3..bd5d3dbe5aa3 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -36,6 +36,9 @@ libinc_cpp = libconfig.h++ + + BUILT_SOURCES = scanner.c scanner.h grammar.c grammar.h + ++scanner.h: scanner.c ++ @if test ! -f $@; then rm -f scanner.c; $(MAKE) $(AM_MAKEFLAGS) scanner.c; else :; fi ++ + ## Build mode: C-only or C & C++ + lib_LTLIBRARIES = libconfig.la + +-- +2.51.0 + diff --git a/meta/recipes-extended/libconfig/libconfig_1.8.1.bb b/meta/recipes-extended/libconfig/libconfig_1.8.1.bb new file mode 100644 index 000000000000..37c2504b0168 --- /dev/null +++ b/meta/recipes-extended/libconfig/libconfig_1.8.1.bb @@ -0,0 +1,30 @@ +SUMMARY = "C/C++ Configuration File Library" +DESCRIPTION = "Library for manipulating structured configuration files" +HOMEPAGE = "https://hyperrealm.github.io/libconfig/" +BUGTRACKER = "https://github.com/hyperrealm/libconfig/issues" +SECTION = "libs" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=17c8e32f0f72580cc2906b409d46b5ac" + +SRC_URI = " \ + git://github.com/hyperrealm/libconfig.git;protocol=https;branch=master;tag=v${PV} \ + file://0001-Add-missing-dependency-for-scanner.h.patch \ +" +SRCREV = "47ec93c588f534d20f6ee8704d2a2cec339db7b7" + +# needed when we modify grammar.y with patches +DEPENDS += "bison-native flex-native" + +UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" + +inherit autotools pkgconfig + +PACKAGE_BEFORE_PN = "${PN}++" +FILES:${PN}++ = "${libdir}/${BPN}++*${SOLIBS}" + +# remove autogenerated files which seem to trigger reproducibility issues +do_compile:prepend() { + rm -f ${S}/lib/grammar.[ch] + rm -f ${S}/lib/scanner.[ch] +}
One of the freedreno tools in the Mesa package depends on libconfig. Recipes from other layers also depend on libconfig. It makes sense to move libconfig to OE-Core in order to reduce inter-layer dependencies. Changes between meta-oe and this recipe: - Upgraded to 1.8.1 - Switched to UPSTREAM_CHECK_GITTAGREGEX - Switched from autotools-brokensep to autotools - Added a patch fixing reproducibility issues Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> --- meta/conf/distro/include/maintainers.inc | 1 + ...Add-missing-dependency-for-scanner.h.patch | 33 +++++++++++++++++++ .../libconfig/libconfig_1.8.1.bb | 30 +++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 meta/recipes-extended/libconfig/libconfig/0001-Add-missing-dependency-for-scanner.h.patch create mode 100644 meta/recipes-extended/libconfig/libconfig_1.8.1.bb