| Message ID | 20251030115415.2566247-2-dmitry.baryshkov@oss.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v4,1/2] libconfig: import recipe from meta-oe | expand |
> On 30 Oct 2025, at 11:54, Dmitry Baryshkov via lists.openembedded.org <dmitry.baryshkov=oss.qualcomm.com@lists.openembedded.org> wrote: > > # dependencies for tools. > -TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libxml2 ', '', d)}" > - > -# the fdperf tool requires libconfig (a part of meta-oe) so it needs special > -# treatment in addition to the usual 'freedreno tools'. > -PACKAGECONFIG[freedreno-fdperf] = ",,libconfig" > +TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libconfig libxml2 ', '', d)}” TOOLS_DEPS is just set as this now: TOOLS_DEPS = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libxml2 ', '', d)}” So just merge those together instead of having two assignments for the same configuration. Ross
On 01/12/2025 20:00, Ross Burton wrote: > > >> On 30 Oct 2025, at 11:54, Dmitry Baryshkov via lists.openembedded.org <dmitry.baryshkov=oss.qualcomm.com@lists.openembedded.org> wrote: >> >> # dependencies for tools. >> -TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libxml2 ', '', d)}" >> - >> -# the fdperf tool requires libconfig (a part of meta-oe) so it needs special >> -# treatment in addition to the usual 'freedreno tools'. >> -PACKAGECONFIG[freedreno-fdperf] = ",,libconfig" >> +TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libconfig libxml2 ', '', d)}” > > TOOLS_DEPS is just set as this now: > > TOOLS_DEPS = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libxml2 ', '', d)}” > > So just merge those together instead of having two assignments for the same configuration. This is exactly what should happen. The first line is removed by the patch.
Hi Dmitry, On 12/2/25 12:48 AM, Dmitry Baryshkov via lists.openembedded.org wrote: > On 01/12/2025 20:00, Ross Burton wrote: >> >> >>> On 30 Oct 2025, at 11:54, Dmitry Baryshkov via lists.openembedded.org >>> <dmitry.baryshkov=oss.qualcomm.com@lists.openembedded.org> wrote: >>> >>> # dependencies for tools. >>> -TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', >>> 'freedreno', ' ncurses libxml2 ', '', d)}" >>> - >>> -# the fdperf tool requires libconfig (a part of meta-oe) so it needs >>> special >>> -# treatment in addition to the usual 'freedreno tools'. >>> -PACKAGECONFIG[freedreno-fdperf] = ",,libconfig" >>> +TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', >>> 'freedreno', ' ncurses libconfig libxml2 ', '', d)}” >> >> TOOLS_DEPS is just set as this now: >> >> TOOLS_DEPS = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' >> ncurses libxml2 ', '', d)}” >> >> So just merge those together instead of having two assignments for the >> same configuration. > > This is exactly what should happen. The first line is removed by the patch. > Please rebase, we don't have TOOL_DEPS:append anymore so this won't apply. The change is fine otherwise. Cheers, Quentin
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 6a36aea259f0..fe778e58ee4d 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -148,11 +148,7 @@ TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}" # dependencies for tools. -TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libxml2 ', '', d)}" - -# the fdperf tool requires libconfig (a part of meta-oe) so it needs special -# treatment in addition to the usual 'freedreno tools'. -PACKAGECONFIG[freedreno-fdperf] = ",,libconfig" +TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libconfig libxml2 ', '', d)}" PACKAGECONFIG[tools] = "-Dtools=${@strip_comma('${TOOLS}')}, -Dtools='', ${TOOLS_DEPS}" PACKAGECONFIG[xmlconfig] = "-Dxmlconfig=enabled, -Dxmlconfig=disabled, expat"
With libconfig being a part of OE-Core, we can now drop separate freedreno-fdperf config option and merge the dependency into other freedreno tools dependencies. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> --- meta/recipes-graphics/mesa/mesa.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)