From bae045a4a28ae2ffd938d413583abdbb65f17c42 Mon Sep 17 00:00:00 2001 From: amak Date: Sat, 12 Sep 2020 13:47:43 +1000 Subject: [PATCH] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules --- srcpkgs/rpi-base/files/71-raspberrypi.rules | 16 ++++++++++++ srcpkgs/rpi-base/template | 29 ++++++--------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 srcpkgs/rpi-base/files/71-raspberrypi.rules diff --git a/srcpkgs/rpi-base/files/71-raspberrypi.rules b/srcpkgs/rpi-base/files/71-raspberrypi.rules new file mode 100644 index 00000000000..adebfbf5b2d --- /dev/null +++ b/srcpkgs/rpi-base/files/71-raspberrypi.rules @@ -0,0 +1,16 @@ +# Fix permissions for the vchiq, vcio, vcsm devices. +SUBSYSTEM=="vchiq", GROUP="video", MODE="0660" +SUBSYSTEM=="bcm2708_vcio", GROUP="video", MODE="0660" +SUBSYSTEM=="vc-sm", GROUP="video", MODE="0660" + +# Fix permissions for the gpiomem, gpiochip* devices. +SUBSYSTEM=="bcm2835-gpiomem", GROUP="gpio", MODE="0660" +SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660" + +# Fix permissions for the sysfs nodes needed by some GPIO libraries (e.g. RPi.GPIO). +# https://github.com/RPi-Distro/raspberrypi-sys-mods/blob/master/etc.armhf/udev/rules.d/99-com.rules +SUBSYSTEM=="gpio*", PROGRAM="/bin/sh -c '\ + chown -R root:gpio /sys/class/gpio && chmod -R 770 /sys/class/gpio;\ + chown -R root:gpio /sys/devices/virtual/gpio && chmod -R 770 /sys/devices/virtual/gpio;\ + chown -R root:gpio /sys$devpath && chmod -R 770 /sys$devpath\ +'" diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template index a1e15b06280..1d09335cca3 100644 --- a/srcpkgs/rpi-base/template +++ b/srcpkgs/rpi-base/template @@ -1,29 +1,16 @@ # Template file for 'rpi-base' pkgname=rpi-base -version=2.5 -revision=4 -homepage="http://www.voidlinux.org" -short_desc="Void Linux RaspberryPi base files" +version=2.6 +revision=1 +archs="armv6l* armv7l* aarch64*" +depends="virtual?ntp-daemon rpi-firmware rpi-kernel" +short_desc="Void Linux Raspberry Pi base files" maintainer="Orphaned " license="Public Domain" +homepage="https://www.voidlinux.org" -archs="armv6l* armv7l* aarch64*" -depends="virtual?ntp-daemon rpi-firmware rpi-kernel" +system_groups="gpio" do_install() { - case "$XBPS_TARGET_MACHINE" in - armv6l*) - # Load the audio module by default on RPi. - vmkdir usr/lib/modules-load.d - echo snd-bcm2835 > ${DESTDIR}/usr/lib/modules-load.d/snd_bcm2835.conf - ;; - esac - # Fix permissions for the vchiq, vcio, vcsm devices. - vmkdir usr/lib/udev/rules.d - echo 'SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"' > \ - ${DESTDIR}/usr/lib/udev/rules.d/71-raspberrypi.rules - echo 'SUBSYSTEM=="bcm2708_vcio", GROUP="video", MODE="0660"' >> \ - ${DESTDIR}/usr/lib/udev/rules.d/71-raspberrypi.rules - echo 'SUBSYSTEM=="vc-sm", GROUP="video", MODE="0660"' >> \ - ${DESTDIR}/usr/lib/udev/rules.d/71-raspberrypi.rules + vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d }