correction de bugs

This commit is contained in:
2022-12-17 12:57:03 +01:00
parent d18edeafec
commit 93d7f3fb2b
8 changed files with 55 additions and 8 deletions
+7
View File
@@ -18,11 +18,15 @@ DISABLE_SPLASH = "1"
ENABLE_I2C = "1" ENABLE_I2C = "1"
ENABLE_UART = "1" ENABLE_UART = "1"
KERNEL_MODULE_AUTOLOAD:rpi += "i2c-dev i2c-bcm2708 rtc-ds1307" KERNEL_MODULE_AUTOLOAD:rpi += "i2c-dev i2c-bcm2708 rtc-ds1307"
CMDLINE_SERIAL = "console=tty1"
RPI_EXTRA_CONFIG = ' \n \ RPI_EXTRA_CONFIG = ' \n \
# Yocto Extra config \n \ # Yocto Extra config \n \
dtoverlay=i2c-rtc,ds3231 \n \ dtoverlay=i2c-rtc,ds3231 \n \
' '
# mask systemd-serialgetty parsed attribute SERIAL_CONSOLES
SERIAL_CONSOLES = ""
# Use systemd # Use systemd
DISTRO_FEATURES += " systemd usbhost ipv4 pam format" DISTRO_FEATURES += " systemd usbhost ipv4 pam format"
VIRTUAL-RUNTIME_init_manager = "systemd" VIRTUAL-RUNTIME_init_manager = "systemd"
@@ -36,6 +40,9 @@ IMAGE_FEATURES += " package-management ssh-server-openssh"
MACHINE_FEATURES = "rtc" MACHINE_FEATURES = "rtc"
#KERNEL_MODULE_AUTOLOAD += " i2c-dev" #KERNEL_MODULE_AUTOLOAD += " i2c-dev"
# set /var/log persistent
VOLATILE_LOG_DIR = "no"
PREFERRED_VERSION_cargo = "1.64.0" PREFERRED_VERSION_cargo = "1.64.0"
PREFERRED_VERSION_libstd-rs = "1.64.0" PREFERRED_VERSION_libstd-rs = "1.64.0"
PREFERRED_VERSION_rust = "1.64.0" PREFERRED_VERSION_rust = "1.64.0"
@@ -60,4 +60,7 @@ do_install:append() {
install -d ${D}${systemd_unitdir}/system/ install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/configurateur_backend.service ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/configurateur_backend.service ${D}${systemd_unitdir}/system/
install -d ${D}/var/log/kineintercom
chown -R pi:pi ${D}/var/log/kineintercom
} }
+9 -3
View File
@@ -18,7 +18,7 @@ PV = "1.0.0"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEPENDS = "python3-setuptools-scm-native kine-users" DEPENDS = "python3-setuptools-scm-native kine-users"
RDEPENDS:${PN} = "python3-apscheduler python3-jsonschema python3-pyserial rpi-gpio kine-users" RDEPENDS:${PN} = "python3-apscheduler python3-jsonschema python3-pyserial rpi-gpio kine-users rsyslog"
inherit setuptools3 systemd inherit setuptools3 systemd
@@ -35,10 +35,16 @@ SYSTEMD_SERVICE:${PN} = "kineintercom.service"
do_install:append() { do_install:append() {
install -d ${D}${datadir}/kineintercom install -d ${D}${datadir}/kineintercom
install -m 0644 ${WORKDIR}/database_origin.json ${D}${datadir}/kineintercom/ install -m 0660 ${WORKDIR}/database_origin.json ${D}${datadir}/kineintercom/
install -m 0644 ${WORKDIR}/db.json.schema ${D}${datadir}/kineintercom/ install -m 0660 ${WORKDIR}/db.json.schema ${D}${datadir}/kineintercom/
chown -R root:pi ${D}${datadir}/kineintercom
install -d ${D}${sysconfdir}/kineintercom install -d ${D}${sysconfdir}/kineintercom
chown -R root:pi ${D}${sysconfdir}/kineintercom
chmod 770 ${D}${sysconfdir}/kineintercom
install -d ${D}${systemd_unitdir}/system/ install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/kineintercom.service ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/kineintercom.service ${D}${systemd_unitdir}/system/
install -d ${D}/var/log/kineintercom
chown -R pi:pi ${D}/var/log/kineintercom
} }
@@ -0,0 +1,11 @@
[Unit]
Description=Change owner and group of /dev/gpiomem for RPI.GPIO python API
ConditionPathExists=/dev/gpiomem
[Service]
User=root
Group=root
ExecStart=/bin/sh -c '/bin/chown root:gpio /dev/gpiomem && /bin/chmod g+rw /dev/gpiomem'
[Install]
WantedBy=multi-user.target
+10 -3
View File
@@ -7,18 +7,25 @@ LICENSE = "CLOSED"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI = "file://loadkeysfr.service" SRC_URI = " \
file://loadkeysfr.service \
file://gpiomem.service \
"
S = "${WORKDIR}" S = "${WORKDIR}"
inherit systemd inherit systemd
SYSTEMD_AUTO_ENABLE = "enable" SYSTEMD_AUTO_ENABLE = "enable"
SYSTEMD_SERVICE:${PN} = "loadkeysfr.service" SYSTEMD_SERVICE:${PN} = "loadkeysfr.service gpiomem.service"
FILES:${PN} = "${systemd_unitdir}/system/loadkeysfr.service" FILES:${PN} = " \
${systemd_unitdir}/system/loadkeysfr.service \
${systemd_unitdir}/system/gpiomem.service \
"
do_install:append() { do_install:append() {
install -d ${D}${systemd_unitdir}/system/ install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/loadkeysfr.service ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/loadkeysfr.service ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/gpiomem.service ${D}${systemd_unitdir}/system/
} }
+2 -2
View File
@@ -13,11 +13,11 @@ inherit useradd
USERADD_PACKAGES = "${PN}" USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM:${PN} = "--system sudo; --system adm; --system crontab;" GROUPADD_PARAM:${PN} = "--system sudo; --system adm; --system crontab; --system gpio; --system dialout;"
# To change the password use something like this : "mkpasswd -m sha-512 p@ssw0rd -s 'seed'" # To change the password use something like this : "mkpasswd -m sha-512 p@ssw0rd -s 'seed'"
# mkpasswd from 'whois' debian package # mkpasswd from 'whois' debian package
USERADD_PARAM:${PN} = "--home-dir /home/pi --groups 'sudo,adm' --shell /bin/bash --password '\$6\$kineintercom\$GG8czkna4jULxnX/UcaaAekfnn1wJry7M/7O0zO89jDZ7lwE7Thv2UEGgBX4z8A6gIaARFyzESmQaFB3lLKns/' pi;" USERADD_PARAM:${PN} = "--home-dir /home/pi --groups 'sudo,adm,gpio,dialout' --shell /bin/bash --password '\$6\$kineintercom\$GG8czkna4jULxnX/UcaaAekfnn1wJry7M/7O0zO89jDZ7lwE7Thv2UEGgBX4z8A6gIaARFyzESmQaFB3lLKns/' pi;"
# Specify whether to produce an output package even if it is empty # Specify whether to produce an output package even if it is empty
ALLOW_EMPTY:${PN} = "1" ALLOW_EMPTY:${PN} = "1"
@@ -9,6 +9,7 @@ RDEPENDS:${PN} = " \
python3-six \ python3-six \
python3-pytz \ python3-pytz \
python3-tzlocal \ python3-tzlocal \
python3-tzdata \
" "
inherit pypi setuptools3 inherit pypi setuptools3
@@ -0,0 +1,12 @@
# Copyright (C) 2022 Vincent BENOIT <vincent.benoit@benserv.fr>
# Release under the MIT license (see COPYING.MIT for the terms)
SECTION = "devel/python"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fca9fd5c15a28eb874ba38577a585d48"
LICENSE = "Apache-2.0"
DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
inherit pypi python_setuptools_build_meta
PYPI_PACKAGE = "tzdata"
SRC_URI[sha256sum] = "fe5f866eddd8b96e9fcba978f8e503c909b19ea7efda11e52e39494bad3a7bfa"