From df2e302ebe0a7b27f744c07442badc0637379b49 Mon Sep 17 00:00:00 2001 From: Steve Jeong Date: Thu, 20 Apr 2023 10:09:48 +0900 Subject: [PATCH] etc: rename script more generic. Signed-off-by: Steve Jeong Change-Id: Ia3cdc818a9156a4aaad346e63efdea6e32ab864b --- Android.mk | 2 +- debian/odroid-wiringpi.postrm | 2 +- etc/{odroid-wpi-pwm.sh => odroid-allowuser.sh} | 7 +++---- etc/sudoers.d/odroid-wpi-sudoers | 2 +- udev/rules.d/99-odroid-wiringpi-pwm.rules | 2 +- wiringPi/odroidc4.c | 4 ++-- wiringPi/odroidm1.c | 4 ++-- wiringPi/odroidn2.c | 4 ++-- wiringPi/wiringPi.h | 4 ++-- 9 files changed, 15 insertions(+), 16 deletions(-) rename etc/{odroid-wpi-pwm.sh => odroid-allowuser.sh} (52%) diff --git a/Android.mk b/Android.mk index 6f3ad98..86621b0 100644 --- a/Android.mk +++ b/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := odroid-wpi-pwm.sh +LOCAL_MODULE := odroid-allowuser.sh LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) diff --git a/debian/odroid-wiringpi.postrm b/debian/odroid-wiringpi.postrm index e6d3158..2550fa7 100644 --- a/debian/odroid-wiringpi.postrm +++ b/debian/odroid-wiringpi.postrm @@ -5,7 +5,7 @@ set -e case "$1" in purge) rm -f /etc/udev/rules.d/99-odroid-wiringpi-* - rm -f /etc/odroid-wpi-pwm.sh + rm -f /etc/odroid-allowuser.sh rm -f /etc/sudoers.d/odroid-wpi-sudoers ;; diff --git a/etc/odroid-wpi-pwm.sh b/etc/odroid-allowuser.sh similarity index 52% rename from etc/odroid-wpi-pwm.sh rename to etc/odroid-allowuser.sh index 0ebd025..1fe695a 100644 --- a/etc/odroid-wpi-pwm.sh +++ b/etc/odroid-allowuser.sh @@ -1,11 +1,10 @@ #!/bin/sh -# /etc/odroid-wpi-pwm.sh +# /etc/odroid-allowuser.sh # written by Steve Jeong # -# allow access pwm sys node (with odroid-wiringpi gpiomem). -# udev rules: 99-odroid-wiringpi-pwm.rules -# param: "/sys/class/pwm/pwmchip*" default. +# allow access sys node (with odroid-wiringpi gpiomem). +# udev rules: 99-odroid-wiringpi-*.rules cutoff=0 diff --git a/etc/sudoers.d/odroid-wpi-sudoers b/etc/sudoers.d/odroid-wpi-sudoers index d37bca4..eee432b 100644 --- a/etc/sudoers.d/odroid-wpi-sudoers +++ b/etc/sudoers.d/odroid-wpi-sudoers @@ -1,2 +1,2 @@ # Allow members of the odroid group change permission of wpi -%odroid ALL = (ALL) NOPASSWD: /usr/bin/sh /etc/odroid-wpi-pwm.sh* +%odroid ALL = (ALL) NOPASSWD: /usr/bin/sh /etc/odroid-allowuser.sh* diff --git a/udev/rules.d/99-odroid-wiringpi-pwm.rules b/udev/rules.d/99-odroid-wiringpi-pwm.rules index da2d183..4684a0f 100644 --- a/udev/rules.d/99-odroid-wiringpi-pwm.rules +++ b/udev/rules.d/99-odroid-wiringpi-pwm.rules @@ -1 +1 @@ -ACTION=="add", KERNEL=="pwmchip*", SUBSYSTEM=="pwm", RUN+="/bin/sh /etc/odroid-wpi-pwm.sh /sys/class/pwm/pwmchip*" +ACTION=="add", KERNEL=="pwmchip*", SUBSYSTEM=="pwm", RUN+="/bin/sh /etc/odroid-allowuser.sh /sys/class/pwm/pwmchip*" diff --git a/wiringPi/odroidc4.c b/wiringPi/odroidc4.c index badbe78..0a53acc 100644 --- a/wiringPi/odroidc4.c +++ b/wiringPi/odroidc4.c @@ -427,9 +427,9 @@ static int pwmSetup (int pin) { sprintf(pwmPinPath[pwmPin], "%s/pwm%d", sysPwmPath, (pwmPin % 2)); strncpy(setupedPwmPinPath[pwmPin], pwmPinPath[pwmPin], (BLOCK_SIZE - 1)); #ifdef ANDROID - sprintf(cmd, "su -s sh -c %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]); + sprintf(cmd, "su -s sh -c %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]); #else - sprintf(cmd, "sudo sh %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]); + sprintf(cmd, "sudo sh %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]); #endif inputToSysNode(sysPwmPath, "export", pwmExport); system(cmd); diff --git a/wiringPi/odroidm1.c b/wiringPi/odroidm1.c index 68d40e5..4977bd2 100644 --- a/wiringPi/odroidm1.c +++ b/wiringPi/odroidm1.c @@ -340,9 +340,9 @@ static int pwmSetup (int pin) { sprintf(pwmPinPath[pwmPin], "%s/pwm%d", sysPwmPath, 0); strncpy(setupedPwmPinPath[pwmPin], pwmPinPath[pwmPin], (BLOCK_SIZE - 1)); #ifdef ANDROID - sprintf(cmd, "su -s sh -c %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]); + sprintf(cmd, "su -s sh -c %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]); #else - sprintf(cmd, "sudo sh %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]); + sprintf(cmd, "sudo sh %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]); #endif inputToSysNode(sysPwmPath, "export", pwmExport); system(cmd); diff --git a/wiringPi/odroidn2.c b/wiringPi/odroidn2.c index f83986c..9e36015 100644 --- a/wiringPi/odroidn2.c +++ b/wiringPi/odroidn2.c @@ -412,9 +412,9 @@ static int pwmSetup (int pin) { sprintf(pwmPinPath[pwmPin], "%s/pwm%d", sysPwmPath, (pwmPin % 2)); strncpy(setupedPwmPinPath[pwmPin], pwmPinPath[pwmPin], (BLOCK_SIZE - 1)); #ifdef ANDROID - sprintf(cmd, "su -s sh -c %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]); + sprintf(cmd, "su -s sh -c %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]); #else - sprintf(cmd, "sudo sh %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]); + sprintf(cmd, "sudo sh %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]); #endif inputToSysNode(sysPwmPath, "export", pwmExport); system(cmd); diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h index 585ec98..177cfa3 100644 --- a/wiringPi/wiringPi.h +++ b/wiringPi/wiringPi.h @@ -102,8 +102,8 @@ // Module names #define AML_MODULE_I2C "aml_i2c" -// syspwm -#define PWM_ACCESS_SCRIPT "/etc/odroid-wpi-pwm.sh" +// sysnode +#define SYS_ACCESS_SCRIPT "/etc/odroid-allowuser.sh" // Threads #define PI_THREAD(X) void *X (UNU void *dummy)