3 files changed, 48 insertions, 12 deletions

diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
index 25ab44f75e..aebdd25bda 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
@@ -12,7 +12,7 @@ SRC_URI = "file://fancontrol \
            file://sensors.conf \
            file://sensord \
 "
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 PACKAGECONFIG ??= "sensord"
 PACKAGECONFIG[sensord] = ",,"
@@ -22,20 +22,20 @@ RDEPENDS:${PN}-dev = ""
 do_install() {
     # Install fancontrol configuration file
     install -d ${D}${sysconfdir}/sysconfig
-    install -m 0644 ${WORKDIR}/fancontrol ${D}${sysconfdir}
-    install -m 0644 ${WORKDIR}/sensord ${D}${sysconfdir}/sysconfig
+    install -m 0644 ${UNPACKDIR}/fancontrol ${D}${sysconfdir}
+    install -m 0644 ${UNPACKDIR}/sensord ${D}${sysconfdir}/sysconfig
     # Install libsensors configuration file
     install -d ${D}${sysconfdir}/sensors.d
-    install -m 0644 ${WORKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d
+    install -m 0644 ${UNPACKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d
 
     if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then
         # Install sensord configuration file
-        install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir}
+        install -m 0644 ${UNPACKDIR}/sensord.conf ${D}${sysconfdir}
 
         # Install sensord.cgi script and create world-writable
         # web-accessible sensord directory
         install -d ${D}/www/pages/cgi-bin
-        install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin
+        install -m 0755 ${UNPACKDIR}/sensord.cgi ${D}/www/pages/cgi-bin
         install -d -m a=rwxs ${D}/www/pages/sensord
     fi
 }
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
new file mode 100644
index 0000000000..0ff8b3801b
--- /dev/null
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
@@ -0,0 +1,36 @@
+From fd49cbcb7f3402e1a4a99b71b901a564060039b4 Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Date: Fri, 24 May 2024 14:16:21 +0300
+Subject: [PATCH] Fix building with GCC 14
+
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Upstream-Status: Submitted [https://github.com/lm-sensors/lm-sensors/pull/497]
+---
+ prog/sensord/rrd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
+index a531362bddd5..36d685fce514 100644
+--- a/prog/sensord/rrd.c
++++ b/prog/sensord/rrd.c
+@@ -299,7 +299,7 @@ int rrdInit(void)
+                argv[argc++] = rraBuff;
+                argv[argc] = NULL;
+ 
+-               ret = rrd_create(argc, (char**) argv);
++               ret = rrd_create(argc, (const char**) argv);
+                if (ret == -1) {
+                        sensorLog(LOG_ERR, "Error creating RRD file: %s: %s",
+                                  sensord_args.rrdFile, rrd_get_error());
+@@ -455,7 +455,7 @@ int rrdUpdate(void)
+                const char *argv[] = {
+                        "sensord", sensord_args.rrdFile, rrdBuff, NULL
+                };
+-               if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
++               if ((ret = rrd_update(3, (const char **) /* WEAK */ argv))) {
+                        sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
+                                  sensord_args.rrdFile, rrd_get_error());
+                }
+-- 
+2.39.2
+
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 aba5ab5878..af0f5a7999 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
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=mast
            file://fancontrol.init \
            file://sensord.init \
            file://0001-Change-PIDFile-path-from-var-run-to-run.patch \
+           file://0001-Fix-building-with-GCC-14.patch \
 "
 SRCREV = "1667b850a1ce38151dae17156276f981be6fb557"
 
@@ -43,20 +44,19 @@ SYSTEMD_SERVICE:${PN}-fancontrol = "fancontrol.service"
 SYSTEMD_SERVICE:${PN}-sensord = "sensord.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-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_compile() {
-    sed -i -e 's:^# \(PROG_EXTRA\):\1:' ${S}/Makefile
     # Respect LDFLAGS
     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() {
@@ -70,11 +70,11 @@ do_install() {
     install -d ${D}${INIT_D_DIR}
 
     # Install fancontrol init script
-    install -m 0755 ${WORKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol
+    install -m 0755 ${UNPACKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol
 
     if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then
         # Install sensord init script
-        install -m 0755 ${WORKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord
+        install -m 0755 ${UNPACKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord
     fi
 
     # Insall sensord service script