From 5599e234baf569e9bb0857f4a3e71e21a849ffcb Mon Sep 17 00:00:00 2001 From: Paolo Date: Sat, 9 Dec 2023 07:55:30 +0100 Subject: [PATCH] rockchip,rk322x: fix gpio,i2c group creation (#6023) --- config/sources/families/rk322x.conf | 9 ++++++--- config/sources/families/rockchip.conf | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/config/sources/families/rk322x.conf b/config/sources/families/rk322x.conf index 34a89694a6..5e4fbbf0e1 100644 --- a/config/sources/families/rk322x.conf +++ b/config/sources/families/rk322x.conf @@ -131,7 +131,12 @@ uboot_custom_postprocess() { family_tweaks() { - true + # Create gpio and i2c groups on the build rootfs; they are matched against + # udev rules to allow non-root user access to these resources + chroot_sdcard addgroup --system --quiet --gid 900 gpio + chroot_sdcard addgroup --system --quiet --gid 901 i2c + + return 0 } @@ -148,8 +153,6 @@ family_tweaks_bsp() { install -m 755 $SRC/packages/bsp/rockchip/hdmi-hotplug $destination/usr/local/bin # Peripheral access for specific groups - addgroup --system --quiet --gid 997 gpio - addgroup --system --quiet --gid 998 i2c cp $SRC/packages/bsp/rockchip/70-gpio.rules $destination/etc/udev/rules.d cp $SRC/packages/bsp/rockchip/71-i2c.rules $destination/etc/udev/rules.d diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf index bfd9663b93..ffdb66df62 100644 --- a/config/sources/families/rockchip.conf +++ b/config/sources/families/rockchip.conf @@ -77,6 +77,12 @@ family_tweaks() { display_alert "Can't find pulseaudio config" "${BOARD} - family_tweaks" "warn" fi fi + + # Create gpio and i2c groups on the build rootfs; they are matched against + # udev rules to allow non-root user access to these resources + chroot_sdcard addgroup --system --quiet --gid 900 gpio + chroot_sdcard addgroup --system --quiet --gid 901 i2c + return 0 } @@ -92,8 +98,6 @@ family_tweaks_bsp() { install -m 755 $SRC/packages/bsp/rockchip/hdmi-hotplug $destination/usr/local/bin # Peripheral access for specific groups - addgroup --system --quiet --gid 997 gpio || display_alert "Failed to create 997 group gid" "gpio" "warn" - addgroup --system --quiet --gid 998 i2c || display_alert "Failed to create 997 group gid" "gpio" "warn" cp $SRC/packages/bsp/rockchip/70-gpio.rules $destination/etc/udev/rules.d cp $SRC/packages/bsp/rockchip/71-i2c.rules $destination/etc/udev/rules.d