# ignore changes made to main OE project and bitbake
-*
+
# All the changes you want to track are made in here
!/meta-baikal/
+++ /dev/null
-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"
--- /dev/null
+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"
#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"
--- /dev/null
+# fancontrol configuration file.
+# Place your device specific configuration in this file.
--- /dev/null
+# 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
+
--- /dev/null
+#!/usr/bin/rrdcgi
+
+<html>
+<head>
+<title>sensord</title>
+</head>
+<body>
+Generate a valid sensord.cgi script and install it in your BSP.
+</body>
+</html>
--- /dev/null
+# Default sensord configuration file
+# Syntax: sensord {options} {chips}
+# -i, --interval <time> -- interval between scanning alarms (default 60s)
+# -l, --log-interval <time> -- interval between logging sensors (default 30m)
+# -t, --rrd-interval <time> -- interval between updating RRD file (default 5m)
+# -T, --rrd-no-average -- switch RRD in non-average mode
+# -r, --rrd-file <file> -- RRD file (default <none>)
+# -c, --config-file <file> -- configuration file
+# -p, --pid-file <file> -- PID file (default /var/run/sensord.pid)
+# -f, --syslog-facility <f> -- syslog facility to use (default local4)
+# -g, --rrd-cgi <img-dir> -- output an RRD CGI script and exit
+# -a, --load-average -- include load average in RRD file
+# -d, --debug -- display some debug information
+# -v, --version -- display version and exit
+# -h, --help -- display help and exit
+SENSORD_ARGS="-i60s -l30m -t1m -r/var/lib/sensord.rrd -a"
--- /dev/null
+# sensors configuration file.
+# Place your device specific configuration in this file.
--- /dev/null
+SUMMARY = "lm_sensors configuration files"
+DESCRIPTION = "Hardware health monitoring configuration files"
+HOMEPAGE = "http://www.lm-sensors.org/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRC_URI = "file://fancontrol \
+ file://sensord.cgi \
+ file://sensord.conf \
+ file://sensors.conf \
+ file://sensord \
+"
+S = "${WORKDIR}"
+
+# PACKAGECONFIG ??= "sensord"
+# PACKAGECONFIG[sensord] = ",,"
+
+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 libsensors configuration file
+ install -d ${D}${sysconfdir}/sensors.d
+ install -m 0644 ${WORKDIR}/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 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 -d -m a=rwxs ${D}/www/pages/sensord
+ # fi
+}
+
+# libsensors configuration
+PACKAGES =+ "${PN}-libsensors"
+
+# sensord logging daemon configuration
+# PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)}"
+
+# fancontrol script configuration
+PACKAGES =+ "${PN}-fancontrol"
+
+# # sensord web cgi support
+# PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-cgi', '', d)}"
+# RRECOMMENDS:${PN}-cgi = "lighttpd lighttpd-module-cgi"
+# RDEPENDS:${PN}-cgi = "${PN}-sensord rrdtool"
+# FILES:${PN}-cgi = "/www/*"
+
+# libsensors configuration file
+FILES:${PN}-libsensors = "${sysconfdir}/sensors.d/sensors.conf"
+
+# # sensord logging daemon configuration files
+# FILES:${PN}-sensord = "\
+# ${sysconfdir}/sensord.conf \
+# ${sysconfdir}/sysconfig/sensord \
+# "
+
+# fancontrol script configuration file
+FILES:${PN}-fancontrol = "${sysconfdir}/fancontrol"
--- /dev/null
+From 25f4f8793730ef3d170f1f2bd729a82fd61a4784 Mon Sep 17 00:00:00 2001
+From: puneetse <22071208+puneetse@users.noreply.github.com>
+Date: Wed, 11 Mar 2020 09:36:51 -0700
+Subject: [PATCH] Change PIDFile path from /var/run to /run
+
+/var/run is considered a legacy directory by systemd 239+ and having it in unit files causes a warning to be emitted to the journal.
+
+Upstream-Status: Backport [25f4f8793730ef3d170f1f2bd729a82fd61a4784]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ prog/init/fancontrol.service | 2 +-
+ prog/init/sensord.service | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/prog/init/fancontrol.service b/prog/init/fancontrol.service
+index 3ac1ed02..43293141 100644
+--- a/prog/init/fancontrol.service
++++ b/prog/init/fancontrol.service
+@@ -5,7 +5,7 @@ After=lm_sensors.service
+
+ [Service]
+ Type=simple
+-PIDFile=/var/run/fancontrol.pid
++PIDFile=/run/fancontrol.pid
+ ExecStart=/usr/sbin/fancontrol
+
+ [Install]
+diff --git a/prog/init/sensord.service b/prog/init/sensord.service
+index 2448beeb..af2f0ae9 100644
+--- a/prog/init/sensord.service
++++ b/prog/init/sensord.service
+@@ -5,7 +5,7 @@ After=lm_sensors.service
+ [Service]
+ EnvironmentFile=/etc/sysconfig/sensord
+ Type=forking
+-PIDFile=/var/run/sensord.pid
++PIDFile=/run/sensord.pid
+ ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon
+
+ [Install]
+--
+2.17.1
+
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: fancontrol
+# Required-Start: $local_fs
+# Should-Start:
+# Required-Stop: $local_fs
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: fancontrol initscript
+# Description: Starts and controls the fancontrol daemon
+### END INIT INFO
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+DESC="fan control daemon"
+NAME="fancontrol"
+FANCONTROL=`which $NAME`
+PIDFILE="/var/run/fancontrol.pid"
+
+# Exit if the package is not installed
+[ -x "$FANCONTROL" ] || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: $NAME... "
+ start-stop-daemon -S -p $PIDFILE -b -x $FANCONTROL
+ echo "done."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME... "
+ start-stop-daemon -K -p $PIDFILE
+ echo "done."
+ ;;
+ restart)
+ echo "Restarting $DESC: $NAME... "
+ $0 stop
+ $0 start
+ echo "done."
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+ ;;
+esac
+
+exit 0
--- /dev/null
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: sensord
+# Required-Start: $local_fs
+# Should-Start:
+# Required-Stop: $local_fs
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: sensord initscript
+# Description: Starts the sensord logging daemon
+### END INIT INFO
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+DESC="sensors logging daemon"
+NAME="sensord"
+SENSORD=`which $NAME`
+
+. /etc/init.d/functions || exit 1
+. /etc/sensord.conf || exit 1
+
+# Exit if the package is not installed
+[ -x "$SENSORD" ] || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: $NAME... "
+ start-stop-daemon -S -x $SENSORD -- $SENSORD_ARGS
+ echo "done."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME... "
+ start-stop-daemon -K -x $SENSORD
+ echo "done."
+ ;;
+ restart)
+ echo "Restarting $DESC: $NAME... "
+ $0 stop
+ $0 start
+ echo "done."
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+ ;;
+esac
+
+exit 0
--- /dev/null
+SUMMARY = "Hardware health monitoring applications"
+HOMEPAGE = "https://hwmon.wiki.kernel.org/"
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = " \
+ bison-native \
+ flex-native \
+ virtual/libiconv \
+"
+
+SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=master \
+ file://fancontrol.init \
+ file://sensord.init \
+ file://0001-Change-PIDFile-path-from-var-run-to-run.patch \
+"
+SRCREV = "1667b850a1ce38151dae17156276f981be6fb557"
+
+inherit update-rc.d systemd
+
+RDEPENDS:${PN}-dev = ""
+
+# PACKAGECONFIG ??= "sensord"
+# PACKAGECONFIG[sensord] = "sensord,,rrdtool"
+
+INITSCRIPT_PACKAGES = "\
+ ${PN}-fancontrol \
+ ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \
+ "
+INITSCRIPT_NAME:${PN}-fancontrol = "fancontrol"
+# INITSCRIPT_NAME:${PN}-sensord = "sensord"
+INITSCRIPT_PARAMS:${PN}-fancontrol = "defaults 66"
+# INITSCRIPT_PARAMS:${PN}-sensord = "defaults 67"
+
+SYSTEMD_PACKAGES = "\
+ ${PN} \
+ ${PN}-fancontrol \
+ "
+
+SYSTEMD_SERVICE:${PN} = "lm_sensors.service"
+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}"'
+
+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}"
+}
+
+do_install() {
+ oe_runmake user_install DESTDIR=${D}
+ # if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then
+ # install -m 0755 ${S}/prog/sensord/sensord ${D}${sbindir}
+ # install -m 0644 ${S}/prog/sensord/sensord.8 ${D}${mandir}/man8
+ # fi
+
+ # Install directory
+ install -d ${D}${INIT_D_DIR}
+
+ # Install fancontrol init script
+ install -m 0755 ${WORKDIR}/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
+ # fi
+
+ # Insall sensord service script
+ # install -d ${D}${systemd_unitdir}/system
+ # install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system
+ # if ! ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then
+ # rm ${D}${systemd_system_unitdir}/sensord.service
+ # fi
+}
+
+# RPROVIDES:${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg"
+RPROVIDES:${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-isatools-dbg"
+
+ALLOW_EMPTY:${PN} = "1"
+RDEPENDS:${PN} += " \
+ ${PN}-libsensors \
+ ${PN}-sensors \
+ ${PN}-fancontrol \
+ ${PN}-sensorsdetect \
+ ${PN}-sensorsconfconvert \
+ ${PN}-pwmconfig \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'x86', '${PN}-isatools', '', d)} \
+"
+
+# libsensors packages
+PACKAGES =+ "${PN}-libsensors ${PN}-libsensors-dev ${PN}-libsensors-staticdev ${PN}-libsensors-doc"
+
+# sensors command packages
+PACKAGES =+ "${PN}-sensors ${PN}-sensors-doc"
+
+# sensord logging daemon
+# PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord ${PN}-sensord-doc', '', d)}"
+
+# fancontrol script
+PACKAGES =+ "${PN}-fancontrol ${PN}-fancontrol-doc"
+
+# sensors-detect script
+PACKAGES =+ "${PN}-sensorsdetect ${PN}-sensorsdetect-doc"
+
+# sensors-conf-convert script
+PACKAGES =+ "${PN}-sensorsconfconvert ${PN}-sensorsconfconvert-doc"
+
+# pwmconfig script
+PACKAGES =+ "${PN}-pwmconfig ${PN}-pwmconfig-doc"
+
+# isadump and isaset helper program
+PACKAGES =+ "${PN}-isatools ${PN}-isatools-doc"
+
+
+# libsensors files
+FILES:${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d"
+FILES:${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}"
+FILES:${PN}-libsensors-staticdev = "${libdir}/libsensors.a"
+FILES:${PN}-libsensors-doc = "${mandir}/man3"
+RRECOMMENDS:${PN}-libsensors = "lmsensors-config-libsensors"
+
+# sensors command files
+FILES:${PN}-sensors = "${bindir}/sensors ${libdir}/libsensors.so.*"
+FILES:${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5"
+RDEPENDS:${PN}-sensors = "${PN}-libsensors"
+
+# # sensord logging daemon
+# FILES:${PN}-sensord = "${sbindir}/sensord ${INIT_D_DIR}/sensord ${systemd_system_unitdir}/sensord.service"
+# FILES:${PN}-sensord-doc = "${mandir}/man8/sensord.8"
+# RDEPENDS:${PN}-sensord = "${PN}-sensors rrdtool"
+# RRECOMMENDS:${PN}-sensord = "lmsensors-config-sensord"
+
+# fancontrol script files
+FILES:${PN}-fancontrol = "${sbindir}/fancontrol ${INIT_D_DIR}/fancontrol"
+FILES:${PN}-fancontrol-doc = "${mandir}/man8/fancontrol.8"
+RDEPENDS:${PN}-fancontrol = "bash"
+RRECOMMENDS:${PN}-fancontrol = "lmsensors-config-fancontrol"
+
+# sensors-detect script files
+FILES:${PN}-sensorsdetect = "${sbindir}/sensors-detect"
+FILES:${PN}-sensorsdetect-doc = "${mandir}/man8/sensors-detect.8"
+RDEPENDS:${PN}-sensorsdetect = "${PN}-sensors perl perl-modules"
+
+# sensors-conf-convert script files
+FILES:${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert"
+FILES:${PN}-sensorsconfconvert-doc = "${mandir}/man8/sensors-conf-convert.8"
+RDEPENDS:${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules"
+
+# pwmconfig script files
+FILES:${PN}-pwmconfig = "${sbindir}/pwmconfig"
+FILES:${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8"
+RDEPENDS:${PN}-pwmconfig = "${PN}-fancontrol bash"
+
+# isadump and isaset helper program files
+FILES:${PN}-isatools = "${sbindir}/isa*"
+FILES:${PN}-isatools-doc = "${mandir}/man8/isa*"
projects / openembedded-baikal.git / commitdiff