From: Baikal Electronics Date: Fri, 2 Dec 2022 08:30:25 +0000 (+0300) Subject: Add lmsensors package. Rename u-boot_2022.07 -> u-boot_2022.10 X-Git-Tag: baikal/mips/sdk6.1~14^2~1 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=560a153ceb0873dfac18906c022cce3a1b7c8daf;p=openembedded-baikal.git Add lmsensors package. Rename u-boot_2022.07 -> u-boot_2022.10 --- diff --git a/.gitignore b/.gitignore index 4059fda..8befde4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # ignore changes made to main OE project and bitbake -* + # All the changes you want to track are made in here !/meta-baikal/ diff --git a/meta-baikal/recipes-bsp/u-boot/u-boot_2022.07.bbappend b/meta-baikal/recipes-bsp/u-boot/u-boot_2022.07.bbappend deleted file mode 100644 index f9dcef3..0000000 --- a/meta-baikal/recipes-bsp/u-boot/u-boot_2022.07.bbappend +++ /dev/null @@ -1,44 +0,0 @@ -inherit externalsrc - -EXTERNALSRC = "${UBOOT_DIR}" - -do_extsrc_clean () { - if [ -d ${BAIKAL_IMAGES} ]; then - rm -f ${BAIKAL_IMAGES}/*u-boot* - fi - - oe_runmake -C ${S} mrproper -} -addtask do_extsrc_clean - -do_cleanall[prefuncs] += "do_extsrc_clean" - -include u-boot-environment.inc - -baikal_deploy () { - if [ ! -d ${BAIKAL_IMAGES} ]; then - mkdir -p ${BAIKAL_IMAGES} - fi - if [ -n "${UBOOT_CONFIG}" ] - then - for config in ${UBOOT_MACHINE}; do - i=$(expr $i + 1); - for type in ${UBOOT_CONFIG}; do - j=$(expr $j + 1); - if [ $j -eq $i ] - then - install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${BAIKAL_IMAGES}/${type}.${UBOOT_BINARY} - fi - done - unset j - done - unset i - else - install -D -m 644 ${B}/${UBOOT_BINARY} ${BAIKAL_IMAGES}/${MACHINE}.${UBOOT_BINARY} - fi - if [ -f ${WORKDIR}/${MACHINE}.bin ]; then - cp -f ${WORKDIR}/${MACHINE}.bin ${BAIKAL_IMAGES}/${MACHINE}.bin - fi -} - -do_deploy[postfuncs] += "baikal_deploy" diff --git a/meta-baikal/recipes-bsp/u-boot/u-boot_2022.10.bbappend b/meta-baikal/recipes-bsp/u-boot/u-boot_2022.10.bbappend new file mode 100644 index 0000000..f9dcef3 --- /dev/null +++ b/meta-baikal/recipes-bsp/u-boot/u-boot_2022.10.bbappend @@ -0,0 +1,44 @@ +inherit externalsrc + +EXTERNALSRC = "${UBOOT_DIR}" + +do_extsrc_clean () { + if [ -d ${BAIKAL_IMAGES} ]; then + rm -f ${BAIKAL_IMAGES}/*u-boot* + fi + + oe_runmake -C ${S} mrproper +} +addtask do_extsrc_clean + +do_cleanall[prefuncs] += "do_extsrc_clean" + +include u-boot-environment.inc + +baikal_deploy () { + if [ ! -d ${BAIKAL_IMAGES} ]; then + mkdir -p ${BAIKAL_IMAGES} + fi + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${BAIKAL_IMAGES}/${type}.${UBOOT_BINARY} + fi + done + unset j + done + unset i + else + install -D -m 644 ${B}/${UBOOT_BINARY} ${BAIKAL_IMAGES}/${MACHINE}.${UBOOT_BINARY} + fi + if [ -f ${WORKDIR}/${MACHINE}.bin ]; then + cp -f ${WORKDIR}/${MACHINE}.bin ${BAIKAL_IMAGES}/${MACHINE}.bin + fi +} + +do_deploy[postfuncs] += "baikal_deploy" diff --git a/meta-baikal/recipes-core/images/core-image-minimal.bbappend b/meta-baikal/recipes-core/images/core-image-minimal.bbappend index 093cdf7..6ce8e92 100644 --- a/meta-baikal/recipes-core/images/core-image-minimal.bbappend +++ b/meta-baikal/recipes-core/images/core-image-minimal.bbappend @@ -8,7 +8,7 @@ IMAGE_INSTALL:append = " dropbear" #MAGE_INSTALL:append = " strace" #IMAGE_INSTALL:append = " kexec-tools" # IMAGE_INSTALL:append = " i2c-tools" -# IMAGE_INSTALL:append = " lmsensors" +IMAGE_INSTALL:append = " lmsensors-sensors" IMAGE_INSTALL:append = " benchmarks" EXTRA_IMAGE_FEATURES += "debug-tweaks" diff --git a/meta-baikal/recipes-support/lmsensors/lmsensors-config/fancontrol b/meta-baikal/recipes-support/lmsensors/lmsensors-config/fancontrol new file mode 100644 index 0000000..1f03a2b --- /dev/null +++ b/meta-baikal/recipes-support/lmsensors/lmsensors-config/fancontrol @@ -0,0 +1,2 @@ +# fancontrol configuration file. +# Place your device specific configuration in this file. diff --git a/meta-baikal/recipes-support/lmsensors/lmsensors-config/sensord b/meta-baikal/recipes-support/lmsensors/lmsensors-config/sensord new file mode 100644 index 0000000..a58362e --- /dev/null +++ b/meta-baikal/recipes-support/lmsensors/lmsensors-config/sensord @@ -0,0 +1,16 @@ +# configuration for hardware sensors monitoring daemon +# in intervals use suffix "m" for minutes, "s" for seconds, "h" for hours +# 0 means turning facility off + +# interval between scanning alarms +INTERVAL=1m + +# interval between logging +LOG_INTERVAL=20m + +# interval between RRD logging +# RRD_INTERVAL=1m + +# RRD db location +# RRD_LOGFILE=/var/log/sensors.rrd + diff --git a/meta-baikal/recipes-support/lmsensors/lmsensors-config/sensord.cgi b/meta-baikal/recipes-support/lmsensors/lmsensors-config/sensord.cgi new file mode 100644 index 0000000..b1aad05 --- /dev/null +++ b/meta-baikal/recipes-support/lmsensors/lmsensors-config/sensord.cgi @@ -0,0 +1,10 @@ +#!/usr/bin/rrdcgi + + + +sensord + + +Generate a valid sensord.cgi script and install it in your BSP. + + diff --git a/meta-baikal/recipes-support/lmsensors/lmsensors-config/sensord.conf b/meta-baikal/recipes-support/lmsensors/lmsensors-config/sensord.conf new file mode 100644 index 0000000..6b48cf6 --- /dev/null +++ b/meta-baikal/recipes-support/lmsensors/lmsensors-config/sensord.conf @@ -0,0 +1,16 @@ +# Default sensord configuration file +# Syntax: sensord {options} {chips} +# -i, --interval