| Message ID | 20250424125034.73053-1-l.anderweit@phytec.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-oe] lmsensors: Fix build without sensord | expand |
On 2025/4/24 20:50, Leonard Anderweit wrote: > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and know the content is safe. > > When building with sensord disabled (PACKAGECONFIG = ""), do_install > would fail because it tried to build sensord which was skiped in > do_compile. > Error log: > make: *** No rule to make target 'rrd.h', needed by 'prog/sensord/rrd.rd'. Stop. > > Avoid building sensord in do_install by explicitly setting PROG_EXTRA. > > Fixes: 86b20b84ec27 (lmsensors: Clean stale files for sensord to avoid > incorrect GCC header dependencies) > > Signed-off-by: Leonard Anderweit <l.anderweit@phytec.de> > --- > meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb > index 9b072d70b20e..4df03420ae8f 100644 > --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb > +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb > @@ -49,7 +49,8 @@ S = "${WORKDIR}/git" > EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \ > MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ > LIBDIR=${libdir} \ > - CC="${CC}" AR="${AR}"' > + CC="${CC}" AR="${AR}" \ > + PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}"' > > do_configure:prepend() { > sed -i -e 's:^#\(PROG_EXTRA\):\1:' ${S}/Makefile For this fix, do_configure:prepend() { sed -i -e 's:^#\(PROG_EXTRA\):\1:' ${S}/Makefile is no longer needed. Thanks, Haixiao > @@ -60,7 +61,7 @@ do_compile() { > sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile > sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \ > ${S}/lib/Module.mk > - oe_runmake user PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}" > + oe_runmake user > } > > do_install() { > -- > 2.43.0 >
On Thu, Apr 24, 2025 at 02:50 PM, Leonard Anderweit wrote: > > When building with sensord disabled (PACKAGECONFIG = ""), do_install > would fail because it tried to build sensord which was skiped in > do_compile. > Error log: > make: *** No rule to make target 'rrd.h', needed by 'prog/sensord/rrd.rd'. > Stop. > > Avoid building sensord in do_install by explicitly setting PROG_EXTRA. > > Fixes: 86b20b84ec27 (lmsensors: Clean stale files for sensord to avoid > incorrect GCC header dependencies) > > Signed-off-by: Leonard Anderweit <l.anderweit@phytec.de> Can confirm it fixes the build in kirkstone as well (which currently is also broken), so Tested-by: Jonas Gorski <jonas.gorski@bisdn.de>
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index 9b072d70b20e..4df03420ae8f 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -49,7 +49,8 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \ MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ LIBDIR=${libdir} \ - CC="${CC}" AR="${AR}"' + CC="${CC}" AR="${AR}" \ + PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}"' do_configure:prepend() { sed -i -e 's:^#\(PROG_EXTRA\):\1:' ${S}/Makefile @@ -60,7 +61,7 @@ do_compile() { sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \ ${S}/lib/Module.mk - oe_runmake user PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}" + oe_runmake user } do_install() {
When building with sensord disabled (PACKAGECONFIG = ""), do_install would fail because it tried to build sensord which was skiped in do_compile. Error log: make: *** No rule to make target 'rrd.h', needed by 'prog/sensord/rrd.rd'. Stop. Avoid building sensord in do_install by explicitly setting PROG_EXTRA. Fixes: 86b20b84ec27 (lmsensors: Clean stale files for sensord to avoid incorrect GCC header dependencies) Signed-off-by: Leonard Anderweit <l.anderweit@phytec.de> --- meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)