From 0502646dd3538d4f3c9d85f07a8d211c3b48f7fc Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 16 Jun 2022 00:59:47 -0400 Subject: [PATCH] demo-i2c-udev-conf: update for reworked agl-service-hvac Update demo-i2c-udev-conf recipe and the script and systemd unit it installs to generate the configuration that the reworked agl-service-hvac daemon expects for LED configuration for the demo platform. Bug-AGL: SPEC-4409 Signed-off-by: Scott Murray Change-Id: I8a746681a5f0acab9aa834796abd3607570e54b4 --- recipes-core/udev/demo-i2c-udev-conf/99-agl-led-rtc.rules | 2 +- .../udev/demo-i2c-udev-conf/agl-service-hvac-leds.conf.in | 4 ++++ .../{hvac-json-in-rewrite.sh => hvac-conf-in-rewrite.sh} | 10 ++++++---- .../udev/demo-i2c-udev-conf/hvac-conf-in-rewrite@.service | 8 ++++++++ .../udev/demo-i2c-udev-conf/hvac-json-in-rewrite@.service | 8 -------- recipes-core/udev/demo-i2c-udev-conf/hvac.json.in | 7 ------- recipes-core/udev/demo-i2c-udev-conf_1.0.bb | 14 +++++++------- 7 files changed, 26 insertions(+), 27 deletions(-) create mode 100644 recipes-core/udev/demo-i2c-udev-conf/agl-service-hvac-leds.conf.in rename recipes-core/udev/demo-i2c-udev-conf/{hvac-json-in-rewrite.sh => hvac-conf-in-rewrite.sh} (64%) create mode 100644 recipes-core/udev/demo-i2c-udev-conf/hvac-conf-in-rewrite@.service delete mode 100644 recipes-core/udev/demo-i2c-udev-conf/hvac-json-in-rewrite@.service delete mode 100644 recipes-core/udev/demo-i2c-udev-conf/hvac.json.in diff --git a/recipes-core/udev/demo-i2c-udev-conf/99-agl-led-rtc.rules b/recipes-core/udev/demo-i2c-udev-conf/99-agl-led-rtc.rules index 34fa06784..f406646ab 100644 --- a/recipes-core/udev/demo-i2c-udev-conf/99-agl-led-rtc.rules +++ b/recipes-core/udev/demo-i2c-udev-conf/99-agl-led-rtc.rules @@ -6,7 +6,7 @@ ACTION=="add", ENV{DEVTYPE}=="usb_interface", ENV{DRIVER}=="i2c-tiny-usb", RUN+= ACTION=="add", ENV{DEVTYPE}=="usb_interface", ENV{DRIVER}=="i2c-tiny-usb", RUN+="/usr/bin/logger 'Loading rtc driver'", RUN+="/sbin/modprobe rtc-ds1307" # %k is the blinkm i2c device e.g. 6-0009 -ACTION=="add", ENV{DRIVER}=="blinkm", SUBSYSTEM=="i2c", RUN+="/usr/bin/logger 'the blinkm device is %k'", TAG+="systemd", ENV{SYSTEMD_WANTS}="hvac-json-in-rewrite@%k.service", GOTO="very_end" +ACTION=="add", ENV{DRIVER}=="blinkm", SUBSYSTEM=="i2c", RUN+="/usr/bin/logger 'the blinkm device is %k'", TAG+="systemd", ENV{SYSTEMD_WANTS}="hvac-conf-in-rewrite@%k.service", GOTO="very_end" # FIXME: We do not exclude the blinkm on the next lines, yet. The rule is too broad, but that is all we know already. Above is actually later in time. # For now this is not critical as the rtc init will just fail and we're done. diff --git a/recipes-core/udev/demo-i2c-udev-conf/agl-service-hvac-leds.conf.in b/recipes-core/udev/demo-i2c-udev-conf/agl-service-hvac-leds.conf.in new file mode 100644 index 000000000..b4f2eb770 --- /dev/null +++ b/recipes-core/udev/demo-i2c-udev-conf/agl-service-hvac-leds.conf.in @@ -0,0 +1,4 @@ +[leds] +red = "/sys/class/leds/blinkm-@DEVICE@-red/brightness" +green = "/sys/class/leds/blinkm-@DEVICE@-green/brightness" +blue = "/sys/class/leds/blinkm-@DEVICE@-blue/brightness" diff --git a/recipes-core/udev/demo-i2c-udev-conf/hvac-json-in-rewrite.sh b/recipes-core/udev/demo-i2c-udev-conf/hvac-conf-in-rewrite.sh similarity index 64% rename from recipes-core/udev/demo-i2c-udev-conf/hvac-json-in-rewrite.sh rename to recipes-core/udev/demo-i2c-udev-conf/hvac-conf-in-rewrite.sh index 555766015..c1e08f1c2 100755 --- a/recipes-core/udev/demo-i2c-udev-conf/hvac-json-in-rewrite.sh +++ b/recipes-core/udev/demo-i2c-udev-conf/hvac-conf-in-rewrite.sh @@ -1,17 +1,19 @@ #!/bin/bash - +# SPDX-License-Identifier: Apache-2.0 # (C) 2018 Jan-Simon Möller, dl9pf@gmx.de, jsmoeller@linuxfoundation.org -# License: Apache License 2.0 +# (C) 2022 Scott Murray #set -x set -e +TARGET="/etc/xdg/AGL/agl-service-hvac-leds.conf" + if [ $1 ] ; then # The device is always 0009 -> 9 . Only change is the i2c IF . LED=`echo $1 | sed -e "s#0009#9#g"` if [ $? -eq 0 ] ; then echo "$LED" - sed -e "s#@DEVICE@#$LED#" /etc/hvac.json.in > /etc/hvac.json + sed -e "s#@DEVICE@#$LED#" ${TARGET}.in > ${TARGET} else echo "Invalid argument" exit 1 @@ -19,4 +21,4 @@ if [ $1 ] ; then else echo "Need argument" exit 1 -fi \ No newline at end of file +fi diff --git a/recipes-core/udev/demo-i2c-udev-conf/hvac-conf-in-rewrite@.service b/recipes-core/udev/demo-i2c-udev-conf/hvac-conf-in-rewrite@.service new file mode 100644 index 000000000..e6e0c1d69 --- /dev/null +++ b/recipes-core/udev/demo-i2c-udev-conf/hvac-conf-in-rewrite@.service @@ -0,0 +1,8 @@ +[Unit] +Description=AGL hvac LED write agl-service-hvac-leds.conf +Before=agl-service-hvac.service + +[Service] +Type=oneshot +ExecStartPre=/usr/bin/logger '#hvac i2c device has been attached - %i' +ExecStart=/usr/sbin/hvac-conf-in-rewrite.sh %i diff --git a/recipes-core/udev/demo-i2c-udev-conf/hvac-json-in-rewrite@.service b/recipes-core/udev/demo-i2c-udev-conf/hvac-json-in-rewrite@.service deleted file mode 100644 index 2fb099593..000000000 --- a/recipes-core/udev/demo-i2c-udev-conf/hvac-json-in-rewrite@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=AGL hvac LED write /etc/hvac.json -#Before= todo: add dependency of hvac service ? - -[Service] -Type=oneshot -ExecStartPre=/usr/bin/logger '#hvac i2c device has been attached - %i' -ExecStart=/usr/sbin/hvac-json-in-rewrite.sh %i diff --git a/recipes-core/udev/demo-i2c-udev-conf/hvac.json.in b/recipes-core/udev/demo-i2c-udev-conf/hvac.json.in deleted file mode 100644 index 01541a600..000000000 --- a/recipes-core/udev/demo-i2c-udev-conf/hvac.json.in +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ledtemp": { - "red": "/sys/class/leds/blinkm-@DEVICE@-red/brightness", - "green": "/sys/class/leds/blinkm-@DEVICE@-green/brightness", - "blue": "/sys/class/leds/blinkm-@DEVICE@-blue/brightness" - } -} diff --git a/recipes-core/udev/demo-i2c-udev-conf_1.0.bb b/recipes-core/udev/demo-i2c-udev-conf_1.0.bb index 332c698b3..7707df60a 100644 --- a/recipes-core/udev/demo-i2c-udev-conf_1.0.bb +++ b/recipes-core/udev/demo-i2c-udev-conf_1.0.bb @@ -2,27 +2,27 @@ SUMMARY = "USB attached I2C demo hardware udev configuration" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -SRC_URI = "file://hvac-json-in-rewrite.sh \ +SRC_URI = "file://hvac-conf-in-rewrite.sh \ file://rtc-i2c-attach.sh \ - file://hvac-json-in-rewrite@.service \ + file://hvac-conf-in-rewrite@.service \ file://rtc-i2c-attach@.service \ file://99-agl-led-rtc.rules \ - file://hvac.json.in \ + file://agl-service-hvac-leds.conf.in \ " do_compile[noexec] = "1" do_install() { - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/hvac.json.in ${D}${sysconfdir} + install -d ${D}${sysconfdir}/xdg/AGL + install -m 0644 ${WORKDIR}/agl-service-hvac-leds.conf.in ${D}${sysconfdir}/xdg/AGL install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/hvac-json-in-rewrite.sh ${D}${sbindir} + install -m 0755 ${WORKDIR}/hvac-conf-in-rewrite.sh ${D}${sbindir} install -m 0755 ${WORKDIR}/rtc-i2c-attach.sh ${D}${sbindir} if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/hvac-json-in-rewrite@.service ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/hvac-conf-in-rewrite@.service ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/rtc-i2c-attach@.service ${D}${systemd_system_unitdir} install -d ${D}${sysconfdir}/udev/rules.d -- 2.16.6