Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules
@ 2020-09-12  4:38 amak79
  2020-09-13  0:46 ` [PR PATCH] [Updated] " amak79
                   ` (24 more replies)
  0 siblings, 25 replies; 26+ messages in thread
From: amak79 @ 2020-09-12  4:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 884 bytes --]

There is a new pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

[RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Add udev rules for GPIO access.
- Add system group `gpio`.
- Fix xlint warnings.

Build for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 3063 bytes --]

From a1c6a2c2c7313103fd8f727a693200f251550a37 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
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..07975bf9415
--- /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 GPIO libraries (e.g. RPi.GPIO).
+# See 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 <orphan@voidlinux.org>"
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
@ 2020-09-13  0:46 ` amak79
  2020-09-13  2:25 ` amak79
                   ` (23 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-09-13  0:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 889 bytes --]

There is an updated pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

[RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Add udev rules for GPIO access.
- Add system group `gpio`.
- Fix xlint warnings.

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 3064 bytes --]

From bae045a4a28ae2ffd938d413583abdbb65f17c42 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
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 <orphan@voidlinux.org>"
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
  2020-09-13  0:46 ` [PR PATCH] [Updated] " amak79
@ 2020-09-13  2:25 ` amak79
  2020-09-29  2:30 ` rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file ericonr
                   ` (22 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-09-13  2:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 889 bytes --]

There is an updated pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

[RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Add udev rules for GPIO access.
- Add system group `gpio`.
- Fix xlint warnings.

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 2370 bytes --]

From 482936f437a8261db3e9830e57c013edc556e311 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
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

---
 srcpkgs/rpi-base/files/71-raspberrypi.rules |  4 +++
 srcpkgs/rpi-base/template                   | 29 +++++----------------
 2 files changed, 11 insertions(+), 22 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..5d3c596547c
--- /dev/null
+++ b/srcpkgs/rpi-base/files/71-raspberrypi.rules
@@ -0,0 +1,4 @@
+# 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"
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index a1e15b06280..8fcf3581efd 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,29 +1,14 @@
 # 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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
-
+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 <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
 
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
  2020-09-13  0:46 ` [PR PATCH] [Updated] " amak79
  2020-09-13  2:25 ` amak79
@ 2020-09-29  2:30 ` ericonr
  2020-09-30  0:05 ` fosslinux
                   ` (21 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2020-09-29  2:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-700388761

Comment:
@pbui @fosslinux does this look good to you?

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (2 preceding siblings ...)
  2020-09-29  2:30 ` rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file ericonr
@ 2020-09-30  0:05 ` fosslinux
  2020-09-30  0:05 ` fosslinux
                   ` (20 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: fosslinux @ 2020-09-30  0:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-701057598

Comment:
I use my pis headless so can't test. But looks sound.

Something to the effect of `dtparam=audio=on` should be either added or added commeted out to `rpi-frmware/files/config.txt`.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (3 preceding siblings ...)
  2020-09-30  0:05 ` fosslinux
@ 2020-09-30  0:05 ` fosslinux
  2020-09-30  0:47 ` pbui
                   ` (19 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: fosslinux @ 2020-09-30  0:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-701057598

Comment:
I use my pis headless so can't test. But looks sound (pun unintentional!)

Something to the effect of `dtparam=audio=on` should be either added or added commeted out to `rpi-frmware/files/config.txt`.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (4 preceding siblings ...)
  2020-09-30  0:05 ` fosslinux
@ 2020-09-30  0:47 ` pbui
  2020-09-30  1:23 ` amak79
                   ` (18 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: pbui @ 2020-09-30  0:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-701094461

Comment:
LGTM.  Audio works on armv6l pi with `dtparam=audio=on` in `/boot/config.txt`

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (5 preceding siblings ...)
  2020-09-30  0:47 ` pbui
@ 2020-09-30  1:23 ` amak79
  2020-09-30  1:56 ` [PR PATCH] [Updated] " amak79
                   ` (17 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-09-30  1:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-701104099

Comment:
> Something to the effect of `dtparam=audio=on` should be either added or added commeted out to `rpi-frmware/files/config.txt`.

I will make this change. Should audio be on by default?

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (6 preceding siblings ...)
  2020-09-30  1:23 ` amak79
@ 2020-09-30  1:56 ` amak79
  2020-09-30  2:05 ` amak79
                   ` (16 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-09-30  1:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 799 bytes --]

There is an updated pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Fix xlint warnings.

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 3006 bytes --]

From 9b99975ffe35dc01724d014b58e6b3044e9ba570 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Wed, 30 Sep 2020 11:43:38 +1000
Subject: [PATCH 1/2] rpi-firmware: Add option for enabling audio

---
 srcpkgs/rpi-firmware/files/config.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/rpi-firmware/files/config.txt b/srcpkgs/rpi-firmware/files/config.txt
index a5b8eb245bb..ea6233326d6 100755
--- a/srcpkgs/rpi-firmware/files/config.txt
+++ b/srcpkgs/rpi-firmware/files/config.txt
@@ -81,3 +81,6 @@
 
 ## with fake kms
 #dtoverlay=vc4-fkms-v3d
+
+## Enable the BCM2835 audio driver
+#dtparam=audio=on

From 121680bb44d85162165bd0fea007c1b401969d56 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Wed, 30 Sep 2020 11:54:26 +1000
Subject: [PATCH 2/2] rpi-base: don't install snd_bcm2835.conf module file,
 move udev rules to separate file

---
 srcpkgs/rpi-base/files/71-raspberrypi.rules |  4 +++
 srcpkgs/rpi-base/template                   | 29 +++++----------------
 2 files changed, 11 insertions(+), 22 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..5d3c596547c
--- /dev/null
+++ b/srcpkgs/rpi-base/files/71-raspberrypi.rules
@@ -0,0 +1,4 @@
+# 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"
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index a1e15b06280..8fcf3581efd 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,29 +1,14 @@
 # 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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
-
+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 <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
 
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (7 preceding siblings ...)
  2020-09-30  1:56 ` [PR PATCH] [Updated] " amak79
@ 2020-09-30  2:05 ` amak79
  2020-09-30  2:35 ` amak79
                   ` (15 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-09-30  2:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 799 bytes --]

There is an updated pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Fix xlint warnings.

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 3006 bytes --]

From 7d588751d8384ebccb8af4c7a515a0694a1af3fa Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Wed, 30 Sep 2020 11:43:38 +1000
Subject: [PATCH 1/2] rpi-firmware: add option for enabling audio

---
 srcpkgs/rpi-firmware/files/config.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/rpi-firmware/files/config.txt b/srcpkgs/rpi-firmware/files/config.txt
index a5b8eb245bb..ea6233326d6 100755
--- a/srcpkgs/rpi-firmware/files/config.txt
+++ b/srcpkgs/rpi-firmware/files/config.txt
@@ -81,3 +81,6 @@
 
 ## with fake kms
 #dtoverlay=vc4-fkms-v3d
+
+## Enable the BCM2835 audio driver
+#dtparam=audio=on

From e79701e19a49ecae596da40d1f1d51fc92d17076 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Wed, 30 Sep 2020 11:54:26 +1000
Subject: [PATCH 2/2] rpi-base: don't install snd_bcm2835.conf module file,
 move udev rules to separate file

---
 srcpkgs/rpi-base/files/71-raspberrypi.rules |  4 +++
 srcpkgs/rpi-base/template                   | 29 +++++----------------
 2 files changed, 11 insertions(+), 22 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..5d3c596547c
--- /dev/null
+++ b/srcpkgs/rpi-base/files/71-raspberrypi.rules
@@ -0,0 +1,4 @@
+# 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"
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index a1e15b06280..8fcf3581efd 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,29 +1,14 @@
 # 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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
-
+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 <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
 
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (8 preceding siblings ...)
  2020-09-30  2:05 ` amak79
@ 2020-09-30  2:35 ` amak79
  2020-09-30  2:36 ` amak79
                   ` (14 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-09-30  2:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 472 bytes --]

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-701104099

Comment:
> Something to the effect of `dtparam=audio=on` should be either added or added commeted out to `rpi-frmware/files/config.txt`.

I will make this change. Should audio be on by default?

**Edit:** I have set it off (comment out) since the Void docs already mention adding `dtparam=audio=on` to `/boot/config.txt` to enable audio.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (9 preceding siblings ...)
  2020-09-30  2:35 ` amak79
@ 2020-09-30  2:36 ` amak79
  2020-09-30 10:33 ` fosslinux
                   ` (13 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-09-30  2:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-701104099

Comment:
> Something to the effect of `dtparam=audio=on` should be either added or added commeted out to `rpi-frmware/files/config.txt`.

I will make this change. Should audio be on by default?

**Edit:** I have set it off (commented out) since the Void docs already mention adding `dtparam=audio=on` to `/boot/config.txt` to enable audio.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (10 preceding siblings ...)
  2020-09-30  2:36 ` amak79
@ 2020-09-30 10:33 ` fosslinux
  2020-09-30 20:17 ` Johnnynator
                   ` (12 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: fosslinux @ 2020-09-30 10:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 147 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-701307469

Comment:
LGTM

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (11 preceding siblings ...)
  2020-09-30 10:33 ` fosslinux
@ 2020-09-30 20:17 ` Johnnynator
  2020-09-30 22:42 ` [PR PATCH] [Updated] " amak79
                   ` (11 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Johnnynator @ 2020-09-30 20:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-701621441

Comment:
Please also increase the revision in `rpi-firmware/template`

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (12 preceding siblings ...)
  2020-09-30 20:17 ` Johnnynator
@ 2020-09-30 22:42 ` amak79
  2020-09-30 23:03 ` amak79
                   ` (10 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-09-30 22:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

There is an updated pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Fix xlint warnings.
- Add `dtparam=audio=on` to `rpi-frmware/files/config.txt`

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 3475 bytes --]

From d06b69b41fdd1e656ea18793923a0a10f820bd78 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 1 Oct 2020 08:40:11 +1000
Subject: [PATCH 1/2] rpi-firmware: add option for enabling audio

---
 srcpkgs/rpi-firmware/files/config.txt | 3 +++
 srcpkgs/rpi-firmware/template         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-firmware/files/config.txt b/srcpkgs/rpi-firmware/files/config.txt
index a5b8eb245bb..ea6233326d6 100755
--- a/srcpkgs/rpi-firmware/files/config.txt
+++ b/srcpkgs/rpi-firmware/files/config.txt
@@ -81,3 +81,6 @@
 
 ## with fake kms
 #dtoverlay=vc4-fkms-v3d
+
+## Enable the BCM2835 audio driver
+#dtparam=audio=on
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 10e7ca7d089..d43cc7aedd9 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -4,7 +4,7 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
 version=20200819
-revision=1
+revision=2
 archs=noarch
 wrksrc="firmware-${_githash}"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"

From 4d96bfd2f24eb44d9f5ce79d9d523eeab8a62593 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 1 Oct 2020 08:41:11 +1000
Subject: [PATCH 2/2] rpi-base: don't install snd_bcm2835.conf module file,
 move udev rules to separate file

---
 srcpkgs/rpi-base/files/71-raspberrypi.rules |  4 +++
 srcpkgs/rpi-base/template                   | 29 +++++----------------
 2 files changed, 11 insertions(+), 22 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..5d3c596547c
--- /dev/null
+++ b/srcpkgs/rpi-base/files/71-raspberrypi.rules
@@ -0,0 +1,4 @@
+# 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"
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index a1e15b06280..8fcf3581efd 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,29 +1,14 @@
 # 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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
-
+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 <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
 
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (13 preceding siblings ...)
  2020-09-30 22:42 ` [PR PATCH] [Updated] " amak79
@ 2020-09-30 23:03 ` amak79
  2020-10-01  0:06 ` amak79
                   ` (9 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-09-30 23:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

There is an updated pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Fix xlint warnings.
- Add `dtparam=audio=on` to `rpi-frmware/files/config.txt`

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 3562 bytes --]

From 8c28af763a1e9f360c02b7e46642f49611021a32 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 1 Oct 2020 09:01:59 +1000
Subject: [PATCH 1/2] rpi-firmware: add option for enabling audio

---
 srcpkgs/rpi-firmware/files/config.txt | 3 +++
 srcpkgs/rpi-firmware/template         | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rpi-firmware/files/config.txt b/srcpkgs/rpi-firmware/files/config.txt
index a5b8eb245bb..ea6233326d6 100755
--- a/srcpkgs/rpi-firmware/files/config.txt
+++ b/srcpkgs/rpi-firmware/files/config.txt
@@ -81,3 +81,6 @@
 
 ## with fake kms
 #dtoverlay=vc4-fkms-v3d
+
+## Enable the BCM2835 audio driver
+#dtparam=audio=on
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 10e7ca7d089..69059c8f022 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -4,8 +4,8 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
 version=20200819
-revision=1
-archs=noarch
+revision=2
+archs="armv6l* armv7l* aarch64*"
 wrksrc="firmware-${_githash}"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"
 maintainer="Peter Bui <pbui@github.bx612.space>"

From 05350d963ff36ed2e84380aeaa363d83e93b79d8 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 1 Oct 2020 09:02:27 +1000
Subject: [PATCH 2/2] rpi-base: don't install snd_bcm2835.conf module file,
 move udev rules to separate file

---
 srcpkgs/rpi-base/files/71-raspberrypi.rules |  4 +++
 srcpkgs/rpi-base/template                   | 29 +++++----------------
 2 files changed, 11 insertions(+), 22 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..5d3c596547c
--- /dev/null
+++ b/srcpkgs/rpi-base/files/71-raspberrypi.rules
@@ -0,0 +1,4 @@
+# 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"
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index a1e15b06280..8fcf3581efd 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,29 +1,14 @@
 # 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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
-
+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 <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
 
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (14 preceding siblings ...)
  2020-09-30 23:03 ` amak79
@ 2020-10-01  0:06 ` amak79
  2020-10-21 23:33 ` [PR PATCH] [Updated] " amak79
                   ` (8 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-10-01  0:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-701709413

Comment:
> Please also increase the revision in `rpi-firmware/template`

Fixed. Also replaced `noarch` with `armv6l* armv7l* aarch64*` as xlint was complaining.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (15 preceding siblings ...)
  2020-10-01  0:06 ` amak79
@ 2020-10-21 23:33 ` amak79
  2020-11-10  3:50 ` amak79
                   ` (7 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-10-21 23:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

There is an updated pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Fix xlint warnings.
- Add `dtparam=audio=on` to `rpi-frmware/files/config.txt`

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 3004 bytes --]

From 223710353aa10034e27661a3f09c21913077d84d Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 1 Oct 2020 09:01:59 +1000
Subject: [PATCH 1/2] rpi-firmware: add option for enabling audio

---
 srcpkgs/rpi-firmware/files/config.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/rpi-firmware/files/config.txt b/srcpkgs/rpi-firmware/files/config.txt
index a5b8eb245bb..ea6233326d6 100755
--- a/srcpkgs/rpi-firmware/files/config.txt
+++ b/srcpkgs/rpi-firmware/files/config.txt
@@ -81,3 +81,6 @@
 
 ## with fake kms
 #dtoverlay=vc4-fkms-v3d
+
+## Enable the BCM2835 audio driver
+#dtparam=audio=on

From 75ea24e9b16da43b2602320b37cfb768cd8a0d87 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 1 Oct 2020 09:02:27 +1000
Subject: [PATCH 2/2] rpi-base: don't install snd_bcm2835.conf module file,
 move udev rules to separate file

---
 srcpkgs/rpi-base/files/71-raspberrypi.rules |  4 +++
 srcpkgs/rpi-base/template                   | 29 +++++----------------
 2 files changed, 11 insertions(+), 22 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..5d3c596547c
--- /dev/null
+++ b/srcpkgs/rpi-base/files/71-raspberrypi.rules
@@ -0,0 +1,4 @@
+# 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"
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index a1e15b06280..8fcf3581efd 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,29 +1,14 @@
 # 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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
-
+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 <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
 
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (16 preceding siblings ...)
  2020-10-21 23:33 ` [PR PATCH] [Updated] " amak79
@ 2020-11-10  3:50 ` amak79
  2020-11-10  6:43 ` amak79
                   ` (6 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-11-10  3:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

There is an updated pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Fix xlint warnings.
- Add `dtparam=audio=on` to `rpi-frmware/files/config.txt`

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 3004 bytes --]

From 6bb6dab502dd7d2ae147775b2b3132f5e4cd52ea Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 1 Oct 2020 09:01:59 +1000
Subject: [PATCH 1/2] rpi-firmware: add option for enabling audio

---
 srcpkgs/rpi-firmware/files/config.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/rpi-firmware/files/config.txt b/srcpkgs/rpi-firmware/files/config.txt
index a5b8eb245bb..ea6233326d6 100755
--- a/srcpkgs/rpi-firmware/files/config.txt
+++ b/srcpkgs/rpi-firmware/files/config.txt
@@ -81,3 +81,6 @@
 
 ## with fake kms
 #dtoverlay=vc4-fkms-v3d
+
+## Enable the BCM2835 audio driver
+#dtparam=audio=on

From 28418e11052bc32ec253e1f61a3f10ee8768f09a Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 1 Oct 2020 09:02:27 +1000
Subject: [PATCH 2/2] rpi-base: don't install snd_bcm2835.conf module file,
 move udev rules to separate file

---
 srcpkgs/rpi-base/files/71-raspberrypi.rules |  4 +++
 srcpkgs/rpi-base/template                   | 29 +++++----------------
 2 files changed, 11 insertions(+), 22 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..5d3c596547c
--- /dev/null
+++ b/srcpkgs/rpi-base/files/71-raspberrypi.rules
@@ -0,0 +1,4 @@
+# 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"
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index a1e15b06280..8fcf3581efd 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,29 +1,14 @@
 # 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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
-
+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 <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
 
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (17 preceding siblings ...)
  2020-11-10  3:50 ` amak79
@ 2020-11-10  6:43 ` amak79
  2020-11-10  6:47 ` amak79
                   ` (5 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-11-10  6:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

There is an updated pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Fix xlint warnings.
- Add `dtparam=audio=on` to `rpi-frmware/files/config.txt`

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 3497 bytes --]

From bdddea0a28be6ca2229ede6b7dc11b8a6473c57d Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 10 Nov 2020 17:39:38 +1100
Subject: [PATCH 1/2] rpi-firmware: add option for enabling audio

---
 srcpkgs/rpi-firmware/files/config.txt | 3 +++
 srcpkgs/rpi-firmware/template         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-firmware/files/config.txt b/srcpkgs/rpi-firmware/files/config.txt
index a5b8eb245bb..ea6233326d6 100755
--- a/srcpkgs/rpi-firmware/files/config.txt
+++ b/srcpkgs/rpi-firmware/files/config.txt
@@ -81,3 +81,6 @@
 
 ## with fake kms
 #dtoverlay=vc4-fkms-v3d
+
+## Enable the BCM2835 audio driver
+#dtparam=audio=on
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 30cb0f7f2f8..661dd6b848a 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -4,7 +4,7 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
 version=20200819
-revision=2
+revision=3
 archs="armv6l* armv7l* aarch64*"
 wrksrc="firmware-${_githash}"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"

From d560b53cd7e03157b0718d80d2bd7a3cb56cafb5 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 10 Nov 2020 17:41:30 +1100
Subject: [PATCH 2/2] rpi-base: don't install snd_bcm2835.conf module file,
 move udev rules to separate file

---
 srcpkgs/rpi-base/files/71-raspberrypi.rules |  4 +++
 srcpkgs/rpi-base/template                   | 29 +++++----------------
 2 files changed, 11 insertions(+), 22 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..5d3c596547c
--- /dev/null
+++ b/srcpkgs/rpi-base/files/71-raspberrypi.rules
@@ -0,0 +1,4 @@
+# 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"
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index a1e15b06280..8fcf3581efd 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,29 +1,14 @@
 # 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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
-
+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 <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
 
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (18 preceding siblings ...)
  2020-11-10  6:43 ` amak79
@ 2020-11-10  6:47 ` amak79
  2020-11-12  0:39 ` amak79
                   ` (4 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-11-10  6:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-701709413

Comment:
> Please also increase the revision in `rpi-firmware/template`

Fixed.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (19 preceding siblings ...)
  2020-11-10  6:47 ` amak79
@ 2020-11-12  0:39 ` amak79
  2020-12-30  7:12 ` the-maldridge
                   ` (3 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-11-12  0:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-725746065

Comment:
Are there any remaining issues with this PR?

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (20 preceding siblings ...)
  2020-11-12  0:39 ` amak79
@ 2020-12-30  7:12 ` the-maldridge
  2020-12-30  7:41 ` [PR PATCH] [Updated] " amak79
                   ` (2 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: the-maldridge @ 2020-12-30  7:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-752355126

Comment:
No remaining changes, please rebase and @ me for merge.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (21 preceding siblings ...)
  2020-12-30  7:12 ` the-maldridge
@ 2020-12-30  7:41 ` amak79
  2020-12-30  8:16 ` amak79
  2020-12-30  8:24 ` [PR PATCH] [Merged]: " the-maldridge
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-12-30  7:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

There is an updated pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages rpibase
https://github.com/void-linux/void-packages/pull/24844

rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Fix xlint warnings.
- Add `dtparam=audio=on` to `rpi-frmware/files/config.txt`

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

A patch file from https://github.com/void-linux/void-packages/pull/24844.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpibase-24844.patch --]
[-- Type: text/x-diff, Size: 3487 bytes --]

From 8c01d78a62d4155acb0feec9e336f2111fc6e120 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 10 Nov 2020 17:39:38 +1100
Subject: [PATCH 1/2] rpi-firmware: add option for enabling audio

---
 srcpkgs/rpi-firmware/files/config.txt | 3 +++
 srcpkgs/rpi-firmware/template         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-firmware/files/config.txt b/srcpkgs/rpi-firmware/files/config.txt
index a5b8eb245bb..ea6233326d6 100755
--- a/srcpkgs/rpi-firmware/files/config.txt
+++ b/srcpkgs/rpi-firmware/files/config.txt
@@ -81,3 +81,6 @@
 
 ## with fake kms
 #dtoverlay=vc4-fkms-v3d
+
+## Enable the BCM2835 audio driver
+#dtparam=audio=on
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index c2f3162980d..6a328307ff8 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -4,7 +4,7 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
 version=20201123
-revision=3
+revision=4
 archs="armv6l* armv7l* aarch64*"
 wrksrc="firmware-${_githash}"
 provides="linux-firmware-broadcom-${version}_${revision}"

From b532ff9e2809c4e3c856d88047552c9fabef34b1 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 10 Nov 2020 17:41:30 +1100
Subject: [PATCH 2/2] rpi-base: don't install snd_bcm2835.conf module file,
 move udev rules to separate file

---
 srcpkgs/rpi-base/files/71-raspberrypi.rules |  4 +++
 srcpkgs/rpi-base/template                   | 29 +++++----------------
 2 files changed, 11 insertions(+), 22 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..5d3c596547c
--- /dev/null
+++ b/srcpkgs/rpi-base/files/71-raspberrypi.rules
@@ -0,0 +1,4 @@
+# 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"
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index a1e15b06280..8fcf3581efd 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,29 +1,14 @@
 # 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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
-
+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 <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
 
 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
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (22 preceding siblings ...)
  2020-12-30  7:41 ` [PR PATCH] [Updated] " amak79
@ 2020-12-30  8:16 ` amak79
  2020-12-30  8:24 ` [PR PATCH] [Merged]: " the-maldridge
  24 siblings, 0 replies; 26+ messages in thread
From: amak79 @ 2020-12-30  8:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/24844#issuecomment-752370152

Comment:
@the-maldridge Rebased.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Merged]: rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
  2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
                   ` (23 preceding siblings ...)
  2020-12-30  8:16 ` amak79
@ 2020-12-30  8:24 ` the-maldridge
  24 siblings, 0 replies; 26+ messages in thread
From: the-maldridge @ 2020-12-30  8:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

There's a merged pull request on the void-packages repository

rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file
https://github.com/void-linux/void-packages/pull/24844

Description:
- Don't install the `snd_bcm2835.conf` module file. The current template only installs this file for `armv6l` (rpi 1, zero). RPi audio should instead be enabled via the device tree parameter `dtparam=audio=on` in `/boot/config.txt`. RPi audio is disabled by default.
- Move udev rules from template to `files/71-raspberrypi.rules` file.
- Fix xlint warnings.
- Add `dtparam=audio=on` to `rpi-frmware/files/config.txt`

Built for armv6l, armv7l, aarch64.
Tested on armv6l, armv7l.

^ permalink raw reply	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2020-12-30  8:24 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-12  4:38 [PR PATCH] [RFC] rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file, add gpio udev rules amak79
2020-09-13  0:46 ` [PR PATCH] [Updated] " amak79
2020-09-13  2:25 ` amak79
2020-09-29  2:30 ` rpi-base: don't install snd_bcm2835.conf module file, move udev rules to separate file ericonr
2020-09-30  0:05 ` fosslinux
2020-09-30  0:05 ` fosslinux
2020-09-30  0:47 ` pbui
2020-09-30  1:23 ` amak79
2020-09-30  1:56 ` [PR PATCH] [Updated] " amak79
2020-09-30  2:05 ` amak79
2020-09-30  2:35 ` amak79
2020-09-30  2:36 ` amak79
2020-09-30 10:33 ` fosslinux
2020-09-30 20:17 ` Johnnynator
2020-09-30 22:42 ` [PR PATCH] [Updated] " amak79
2020-09-30 23:03 ` amak79
2020-10-01  0:06 ` amak79
2020-10-21 23:33 ` [PR PATCH] [Updated] " amak79
2020-11-10  3:50 ` amak79
2020-11-10  6:43 ` amak79
2020-11-10  6:47 ` amak79
2020-11-12  0:39 ` amak79
2020-12-30  7:12 ` the-maldridge
2020-12-30  7:41 ` [PR PATCH] [Updated] " amak79
2020-12-30  8:16 ` amak79
2020-12-30  8:24 ` [PR PATCH] [Merged]: " the-maldridge

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).