This is a major release for gpiod-sysfs-proxy. Upstream now ships systemd unit files so drop those from the recipe. The project was updated to using the more modern pyfuse3 package. Other than that: it works the same and passes the same set of tests. For sysvinit: some of the command-line arguments are no longer supported in pyfuse3 so remove them from the init script.
Signed-off-by: Bartosz Golaszewski <[email protected]> --- .../gpiod-sysfs-proxy.init.in | 2 +- .../gpiod-sysfs-proxy.service.in | 15 --------- .../gpiod-sysfs-proxy/run-gpio-sys.mount | 13 -------- .../gpiod-sysfs-proxy/sys-class.mount | 16 --------- ...xy_0.1.4.bb => gpiod-sysfs-proxy_1.0.2.bb} | 33 ++++++------------- 5 files changed, 11 insertions(+), 68 deletions(-) delete mode 100644 meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in delete mode 100644 meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/run-gpio-sys.mount delete mode 100644 meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/sys-class.mount rename meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/{gpiod-sysfs-proxy_0.1.4.bb => gpiod-sysfs-proxy_1.0.2.bb} (62%) diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in index cba731c9fd..b3862910c5 100644 --- a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in +++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in @@ -40,7 +40,7 @@ do_start() mkdir -p $MOUNTPOINT fi - $PROG $MOUNTPOINT -o nonempty -o allow_other -o default_permissions -o entry_timeout=0 -o attr_timeout=0 -f | logger -i $NAME & + $PROG $MOUNTPOINT -o allow_other -o default_permissions -f | logger -i $NAME & echo "done" } diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in deleted file mode 100644 index 5f8c4f4834..0000000000 --- a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2024 Bartosz Golaszewski <[email protected]> - -[Unit] -Description=User-space, libgpiod-based compatibility layer for linux GPIO sysfs interface - -[Service] -RuntimeDirectory=gpio -Type=simple -ExecStart=/usr/bin/gpiod-sysfs-proxy @mountpoint@ -f -o nonempty -o allow_other -o default_permissions -o entry_timeout=0 -o attr_timeout=0 -ExecStop=/bin/umount @mountpoint@ -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/run-gpio-sys.mount b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/run-gpio-sys.mount deleted file mode 100644 index a924cb9b64..0000000000 --- a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/run-gpio-sys.mount +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2024 Bartosz Golaszewski <[email protected]> - -[Unit] -Description=Remount of sysfs for gpiod-sysfs-proxy -ConditionPathExists=!/sys/class/gpio - -[Mount] -DirectoryMode=0700 -What=sysfs -Where=/run/gpio/sys -Type=sysfs -Options=nosuid,nodev,noexec diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/sys-class.mount b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/sys-class.mount deleted file mode 100644 index e3e3ce8e74..0000000000 --- a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/sys-class.mount +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2024 Bartosz Golaszewski <[email protected]> - -[Unit] -Description=Overlay on top of /sys/class adding the gpio class directory -Before=gpiod-sysfs-proxy.service -After=run-gpio-sys.mount -ConditionPathExists=!/sys/class/gpio - -[Mount] -RuntimeDirectory=gpio/class/gpio -DirectoryMode=0755 -What=overlay -Where=/sys/class -Type=overlay -Options=upperdir=/run/gpio/class,lowerdir=/run/gpio/sys/class,workdir=/run/gpio/work,ro,nosuid,nodev,noexec,relatime diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_0.1.4.bb b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_1.0.2.bb similarity index 62% rename from meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_0.1.4.bb rename to meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_1.0.2.bb index 52b73f3ff4..6cababfe69 100644 --- a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_0.1.4.bb +++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_1.0.2.bb @@ -1,21 +1,18 @@ SUMMARY = "User-space, libgpiod-based compatibility layer for linux GPIO sysfs interface." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=0dcf8b702b5c96178978c7223f64a73b" +LIC_FILES_CHKSUM = "file://LICENSES/MIT.txt;md5=b1008aa4e86ef6163fc80a22d1547bea" inherit systemd update-rc.d ptest pypi python_pep517 python_setuptools_build_meta useradd PYPI_PACKAGE = "gpiod_sysfs_proxy" SRC_URI += " \ - file://gpiod-sysfs-proxy.service.in \ - file://run-gpio-sys.mount \ - file://sys-class.mount \ file://gpiod-sysfs-proxy.init.in \ file://run-ptest.in \ " -SRC_URI[sha256sum] = "bb38e31e4046a7aa0101c53c9e7e2cf319c0cd9620b9ba1641e962fce44a1f3a" +SRC_URI[sha256sum] = "a12fc9d0778078bf351daa4fab244910ac550e7bef77a12e47c16a1161bc539d" # For full backward compatibility with the kernel sysfs interface, this option # must be selected. However, we don't make it the default as - with kernel sysfs @@ -27,29 +24,18 @@ PACKAGECONFIG[sys-class-mount] = "" export MOUNTPOINT = "${@bb.utils.contains('PACKAGECONFIG', 'sys-class-mount', '/sys/class/gpio', '/run/gpio', d)}" do_install:append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${UNPACKDIR}/gpiod-sysfs-proxy.service.in ${D}${systemd_system_unitdir}/gpiod-sysfs-proxy.service - - if ${@bb.utils.contains('PACKAGECONFIG', 'sys-class-mount', 'true', 'false', d)}; then - install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/ - - install -m 0644 ${UNPACKDIR}/run-gpio-sys.mount ${D}${systemd_system_unitdir}/run-gpio-sys.mount - install -m 0644 ${UNPACKDIR}/sys-class.mount ${D}${systemd_system_unitdir}/sys-class.mount - - ln -sf ../run-gpio-sys.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/run-gpio-sys.mount - ln -sf ../sys-class.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/sys-class.mount - fi - - sed -i "s:@mountpoint@:$MOUNTPOINT:g" ${D}${systemd_system_unitdir}/gpiod-sysfs-proxy.service - elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d install -m 0755 ${UNPACKDIR}/gpiod-sysfs-proxy.init.in ${D}${sysconfdir}/init.d/gpiod-sysfs-proxy sed -i "s:@mountpoint@:$MOUNTPOINT:g" ${D}${sysconfdir}/init.d/gpiod-sysfs-proxy fi } -SYSTEMD_SERVICE:${PN} = "gpiod-sysfs-proxy.service" +SYSTEMD_SERVICE:${PN} = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'sys-class-mount', \ + '[email protected]', \ + '[email protected]', d)} \ +" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "gpiod-sysfs-proxy" @@ -58,9 +44,10 @@ INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 0 1 6 ." FILES:${PN} += "/usr/lib/systemd/system" RDEPENDS:${PN} += " \ - python3-fuse \ python3-gpiod \ + python3-pyfuse3 \ python3-pyudev \ + python3-trio \ " python __anonymous() { -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#127999): https://lists.openembedded.org/g/openembedded-devel/message/127999 Mute This Topic: https://lists.openembedded.org/mt/120080886/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
