lmsensors: Fix build without sensord
PATCH 1/1 lmsensors: Fix build without sensord
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.
incorrect GCC header dependencies)
--- meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +3 -2
@@ -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() {
Signature · 1 line
2.43.0
Quoted 24 lines · Leonard Anderweit
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_installwould fail because it tried to build sensord which was skiped indo_compile.
Error log:
make: *** No rule to make target 'rrd.h', needed by 'prog/sensord/rrd.rd'. Stop.Avoid building sensord in
do_installby explicitly settingPROG_EXTRA.Fixes 86b20b84ec27 (lmsensors: Clean stale files for sensord to avoidincorrect GCC header dependencies)
Signed-off-by Leonard Anderweit <[email protected]>--- meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +0
-0
meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb S = "${WORKDIR}/git" · line 56
Quoted 9 lines
meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +2
-1@@ -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}/Makefileis no longer needed.
Thanks,
Haixiao
Quoted 12 lines
meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +1
-2@@ -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
Quoted 8 lines · Leonard Anderweit
When building with sensord disabled (PACKAGECONFIG = ""),
do_installwould fail because it tried to build sensord which was skiped indo_compile.
Error log:
make: *** No rule to make target 'rrd.h', needed by 'prog/sensord/rrd.rd'. Stop.
Quoted 6 lines
Avoid building sensord in
do_installby explicitly settingPROG_EXTRA.Fixes 86b20b84ec27 (lmsensors: Clean stale files for sensord to avoidincorrect GCC header dependencies)
Signed-off-by Leonard Anderweit <[email protected]>
Can confirm it fixes the build in kirkstone as well (which currently is also broken), so