diff --git a/general/overlay/etc/init.d/S70vendor b/general/overlay/etc/init.d/S70vendor new file mode 100755 index 00000000..9e819094 --- /dev/null +++ b/general/overlay/etc/init.d/S70vendor @@ -0,0 +1,18 @@ +#!/bin/sh + +# load vendor specific drivers +# +vendor=$(ipcinfo -v) +status=$(check_mac) + +log_vendor() { + logger -s -p daemon.info -t ${vendor} "$1" +} + +case "$1" in + start) + [ -n "${status}" ] && log_vendor "${status}" + echo -e '\nLoading of kernel modules...' + load_${vendor} -i + ;; +esac diff --git a/general/overlay/usr/sbin/check_mac b/general/overlay/usr/sbin/check_mac new file mode 120000 index 00000000..756c71c5 --- /dev/null +++ b/general/overlay/usr/sbin/check_mac @@ -0,0 +1 @@ +extutils \ No newline at end of file diff --git a/general/overlay/usr/sbin/extutils b/general/overlay/usr/sbin/extutils index d09f0a0f..10edaaee 100755 --- a/general/overlay/usr/sbin/extutils +++ b/general/overlay/usr/sbin/extutils @@ -13,6 +13,9 @@ case "${CMD}" in cli) yaml-cli -i /etc/majestic.yaml $@ ;; + sensor_cli) + yaml-cli -i /etc/sensor/$(fw_printenv -n sensor).yaml $@ + ;; ipctool) IPCTOOL=/tmp/ipctool if [ ! -x $IPCTOOL ]; then @@ -21,6 +24,11 @@ case "${CMD}" in echo "The ipctool installed as remote GitHub plugin" fi $IPCTOOL $@ + ;; + check_mac) + if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then + XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && [ ! "Nothing found." = "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || echo "Warning. Wired network interface has default MAC address, please change it." + fi ;; *) ;; diff --git a/general/package/allwinner-osdrv-v83x/allwinner-osdrv-v83x.mk b/general/package/allwinner-osdrv-v83x/allwinner-osdrv-v83x.mk index a6a8ec69..8fbb039c 100644 --- a/general/package/allwinner-osdrv-v83x/allwinner-osdrv-v83x.mk +++ b/general/package/allwinner-osdrv-v83x/allwinner-osdrv-v83x.mk @@ -10,9 +10,6 @@ ALLWINNER_OSDRV_V83X_LICENSE = MIT ALLWINNER_OSDRV_V83X_LICENSE_FILES = LICENSE define ALLWINNER_OSDRV_V83X_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - # $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_ALLWINNER_PATH)/package/allwinner-osdrv-v83x/files/script/S95allwinner - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_ALLWINNER_PATH)/package/allwinner-osdrv-v83x/files/sensor/config/* @@ -22,7 +19,6 @@ define ALLWINNER_OSDRV_V83X_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin # $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_ALLWINNER_PATH)/package/allwinner-osdrv-v83x/files/script/load* - # $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_ALLWINNER_PATH)/package/allwinner-osdrv-v83x/files/sample/* $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_ALLWINNER_PATH)/package/allwinner-osdrv-v83x/files/sensor/*.so diff --git a/general/package/allwinner-osdrv-v83x/files/script/S95allwinner b/general/package/allwinner-osdrv-v83x/files/script/S95allwinner deleted file mode 100755 index 66581256..00000000 --- a/general/package/allwinner-osdrv-v83x/files/script/S95allwinner +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t allwinner "Check MAC for allwinner devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t allwinner "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t allwinner "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t allwinner "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t allwinner "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - #load_allwinner - # - export SENSOR=$(fw_printenv -n sensor) - #load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - diff --git a/general/package/allwinner-osdrv-v83x/files/script/load_allwinner b/general/package/allwinner-osdrv-v83x/files/script/load_allwinner index e69de29b..1a248525 100755 --- a/general/package/allwinner-osdrv-v83x/files/script/load_allwinner +++ b/general/package/allwinner-osdrv-v83x/files/script/load_allwinner @@ -0,0 +1 @@ +#!/bin/sh diff --git a/general/package/ambarella-osdrv-s3l/ambarella-osdrv-s3l.mk b/general/package/ambarella-osdrv-s3l/ambarella-osdrv-s3l.mk index a7b1de4a..835f36e8 100644 --- a/general/package/ambarella-osdrv-s3l/ambarella-osdrv-s3l.mk +++ b/general/package/ambarella-osdrv-s3l/ambarella-osdrv-s3l.mk @@ -11,9 +11,6 @@ AMBARELLA_OSDRV_S3L_LICENSE_FILES = LICENSE define AMBARELLA_OSDRV_S3L_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_AMBARELLA_PATH)/package/ambarella-osdrv-s3l/files/script/S95ambarella - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_AMBARELLA_PATH)/package/ambarella-osdrv-s3l/files/sensor/config/*.cfg @@ -21,13 +18,12 @@ define AMBARELLA_OSDRV_S3L_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.104/ambarella $(BR2_EXTERNAL_AMBARELLA_PATH)/package/ambarella-osdrv-s3l/files/kmod/*.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_AMBARELLA_PATH)/package/ambarella-osdrv-s3l/files/script/load_ambarella + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_AMBARELLA_PATH)/package/ambarella-osdrv-s3l/files/script/load* $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_AMBARELLA_PATH)/package/ambarella-osdrv-s3l/files/sensor/*.so $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib - # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_AMBARELLA_PATH)/package/ambarella-osdrv-s3l/files/lib/xxx.so endef diff --git a/general/package/ambarella-osdrv-s3l/files/script/S95ambarella b/general/package/ambarella-osdrv-s3l/files/script/S95ambarella deleted file mode 100755 index 5fed0f8a..00000000 --- a/general/package/ambarella-osdrv-s3l/files/script/S95ambarella +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t anyka "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t anyka "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t anyka "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t anyka "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t anyka "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - #load_anyka - # - #load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/fullhan-osdrv-fh8852v100/files/script/S95fullhan b/general/package/fullhan-osdrv-fh8852v100/files/script/S95fullhan deleted file mode 100755 index 9de94a48..00000000 --- a/general/package/fullhan-osdrv-fh8852v100/files/script/S95fullhan +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t fullhan "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t fullhan "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t fullhan "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t fullhan "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t fullhan "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - #load_fullhan - # - #load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/fullhan-osdrv-fh8852v100/fullhan-osdrv-fh8852v100.mk b/general/package/fullhan-osdrv-fh8852v100/fullhan-osdrv-fh8852v100.mk index e5fe2654..1beb5a23 100644 --- a/general/package/fullhan-osdrv-fh8852v100/fullhan-osdrv-fh8852v100.mk +++ b/general/package/fullhan-osdrv-fh8852v100/fullhan-osdrv-fh8852v100.mk @@ -10,9 +10,6 @@ FULLHAN_OSDRV_FH8852V100_LICENSE = MIT FULLHAN_OSDRV_FH8852V100_LICENSE_FILES = LICENSE define FULLHAN_OSDRV_FH8852V100_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v100/files/script/S95fullhan - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/firmware $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v100/files/firmware/* @@ -20,7 +17,7 @@ define FULLHAN_OSDRV_FH8852V100_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.0.8/fullhan $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v100/files/kmod/*.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v100/files/script/load_fullhan + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v100/files/script/load* $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v100/files/lib/*.so diff --git a/general/package/fullhan-osdrv-fh8852v200/files/script/S95fullhan b/general/package/fullhan-osdrv-fh8852v200/files/script/S95fullhan deleted file mode 100755 index f57df16e..00000000 --- a/general/package/fullhan-osdrv-fh8852v200/files/script/S95fullhan +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t fullhan "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t fullhan "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t fullhan "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t fullhan "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t fullhan "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_fullhan - # - export SENSOR=$(fw_printenv -n sensor) - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/fullhan-osdrv-fh8852v200/fullhan-osdrv-fh8852v200.mk b/general/package/fullhan-osdrv-fh8852v200/fullhan-osdrv-fh8852v200.mk index 3d8cc184..4101dde8 100644 --- a/general/package/fullhan-osdrv-fh8852v200/fullhan-osdrv-fh8852v200.mk +++ b/general/package/fullhan-osdrv-fh8852v200/fullhan-osdrv-fh8852v200.mk @@ -10,9 +10,6 @@ FULLHAN_OSDRV_FH8852V200_LICENSE = MIT FULLHAN_OSDRV_FH8852V200_LICENSE_FILES = LICENSE define FULLHAN_OSDRV_FH8852V200_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v200/files/script/S95fullhan - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/firmware $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v200/files/firmware/* @@ -20,7 +17,7 @@ define FULLHAN_OSDRV_FH8852V200_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.129/fullhan $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v200/files/kmod/*.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v200/files/script/load_fullhan + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v200/files/script/load* $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v200/files/lib/*.so diff --git a/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk b/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk index f965f357..f61c786a 100644 --- a/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk +++ b/general/package/goke-osdrv-gk710x/goke-osdrv-gk710x.mk @@ -18,9 +18,6 @@ else ifeq ($(CHIP),gk7102s) endif define GOKE_OSDRV_GK710X_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/script/S95goke - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/sensor/config/*.bin $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/sensor/config/sc1135.bin @@ -34,7 +31,7 @@ define GOKE_OSDRV_GK710X_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.4.43-Goke/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/sensor/*.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/script/load_* + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/script/load* $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk710x/files/script/ircut_demo # $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors diff --git a/general/package/goke-osdrv-gk7205v200/files/script/S95goke b/general/package/goke-osdrv-gk7205v200/files/script/S95goke deleted file mode 100755 index 793d0e8b..00000000 --- a/general/package/goke-osdrv-gk7205v200/files/script/S95goke +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t goke "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t goke "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t goke "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t goke "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t goke "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_goke -i - # - export SENSOR=$(fw_printenv -n sensor) - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk b/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk index 0d944e05..950213db 100644 --- a/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk +++ b/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk @@ -25,9 +25,6 @@ define GOKE_OSDRV_GK7205V200_INSTALL_STAGING_CMDS endef define GOKE_OSDRV_GK7205V200_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/script/S95goke - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/config/*.ini @@ -84,7 +81,7 @@ define GOKE_OSDRV_GK7205V200_INSTALL_TARGET_CMDS ### $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/kmod/sysconfig.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/script/load_* + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/script/load* $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/script/ircut_demo $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/script/set_allocator diff --git a/general/package/grainmedia-osdrv-gm8136/files/script/S95grainmedia b/general/package/grainmedia-osdrv-gm8136/files/script/S95grainmedia deleted file mode 100755 index 697c38f6..00000000 --- a/general/package/grainmedia-osdrv-gm8136/files/script/S95grainmedia +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t grainmedia "Check MAC for GrainMedia devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t grainmedia "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t grainmedia "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t grainmedia "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t grainmedia "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_grainmedia - # - # - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - diff --git a/general/package/grainmedia-osdrv-gm8136/grainmedia-osdrv-gm8136.mk b/general/package/grainmedia-osdrv-gm8136/grainmedia-osdrv-gm8136.mk index 89976c1d..7e1db60d 100644 --- a/general/package/grainmedia-osdrv-gm8136/grainmedia-osdrv-gm8136.mk +++ b/general/package/grainmedia-osdrv-gm8136/grainmedia-osdrv-gm8136.mk @@ -10,9 +10,6 @@ GRAINMEDIA_OSDRV_GM8136_LICENSE = MIT GRAINMEDIA_OSDRV_GM8136_LICENSE_FILES = LICENSE define GRAINMEDIA_OSDRV_GM8136_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/grainmedia-osdrv-gm8136/files/script/S95grainmedia - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/grainmedia-osdrv-gm8136/files/sensor/config/* diff --git a/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon deleted file mode 100755 index 3a76fa69..00000000 --- a/general/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t hisilicon "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_hisilicon -i - # sample_bindvivo_HISI_V2A 1 - # - export SENSOR=$(fw_printenv -n sensor) - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/hisilicon-osdrv-hi3516av100/hisilicon-osdrv-hi3516av100.mk b/general/package/hisilicon-osdrv-hi3516av100/hisilicon-osdrv-hi3516av100.mk index 47359339..a4a6fe97 100644 --- a/general/package/hisilicon-osdrv-hi3516av100/hisilicon-osdrv-hi3516av100.mk +++ b/general/package/hisilicon-osdrv-hi3516av100/hisilicon-osdrv-hi3516av100.mk @@ -10,9 +10,6 @@ HISILICON_OSDRV_HI3516AV100_LICENSE = MIT HISILICON_OSDRV_HI3516AV100_LICENSE_FILES = LICENSE define HISILICON_OSDRV_HI3516AV100_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/sensor/config/*.ini diff --git a/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon deleted file mode 100755 index f3b4d652..00000000 --- a/general/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t hisilicon "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_hisilicon -i - # - export SENSOR=$(fw_printenv -n sensor) - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk b/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk index 51b638e5..06936b55 100644 --- a/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk +++ b/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk @@ -14,9 +14,6 @@ define HISILICON_OSDRV_HI3516CV100_BUILD_CMDS endef define HISILICON_OSDRV_HI3516CV100_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/sensor/config/*.ini @@ -63,7 +60,7 @@ define HISILICON_OSDRV_HI3516CV100_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.0.8/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/kmod/wdt.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/script/load* $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/script/ircut_demo $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors diff --git a/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon deleted file mode 100755 index f3b4d652..00000000 --- a/general/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t hisilicon "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_hisilicon -i - # - export SENSOR=$(fw_printenv -n sensor) - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk b/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk index bde03ce7..c044d5bd 100644 --- a/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk +++ b/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk @@ -10,9 +10,6 @@ HISILICON_OSDRV_HI3516CV200_LICENSE = MIT HISILICON_OSDRV_HI3516CV200_LICENSE_FILES = LICENSE define HISILICON_OSDRV_HI3516CV200_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/sensor/config/*.ini @@ -62,7 +59,7 @@ define HISILICON_OSDRV_HI3516CV200_INSTALL_TARGET_CMDS # $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/kmod/xxx.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/script/load* $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/script/ircut_demo $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors diff --git a/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon deleted file mode 100755 index f3b4d652..00000000 --- a/general/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t hisilicon "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_hisilicon -i - # - export SENSOR=$(fw_printenv -n sensor) - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/hisilicon-osdrv-hi3516cv300/hisilicon-osdrv-hi3516cv300.mk b/general/package/hisilicon-osdrv-hi3516cv300/hisilicon-osdrv-hi3516cv300.mk index 090fe8ef..f6d0c0ee 100644 --- a/general/package/hisilicon-osdrv-hi3516cv300/hisilicon-osdrv-hi3516cv300.mk +++ b/general/package/hisilicon-osdrv-hi3516cv300/hisilicon-osdrv-hi3516cv300.mk @@ -10,9 +10,6 @@ HISILICON_OSDRV_HI3516CV300_LICENSE = MIT HISILICON_OSDRV_HI3516CV300_LICENSE_FILES = LICENSE define HISILICON_OSDRV_HI3516CV300_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv300/files/sensor/config/*.ini @@ -61,7 +58,7 @@ define HISILICON_OSDRV_HI3516CV300_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.18.20/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv300/files/kmod/virtualhifb.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv300/files/script/load_hisilicon + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv300/files/script/load* $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv300/files/script/ircut_demo $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors diff --git a/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon deleted file mode 100755 index 3928a15b..00000000 --- a/general/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t hisilicon "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_hisilicon -i - # sample_bindvivo_HISI_V4A 1 - # - export SENSOR=$(fw_printenv -n sensor) - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/hisilicon-osdrv-hi3516cv500/hisilicon-osdrv-hi3516cv500.mk b/general/package/hisilicon-osdrv-hi3516cv500/hisilicon-osdrv-hi3516cv500.mk index 34175e60..b9e237e2 100644 --- a/general/package/hisilicon-osdrv-hi3516cv500/hisilicon-osdrv-hi3516cv500.mk +++ b/general/package/hisilicon-osdrv-hi3516cv500/hisilicon-osdrv-hi3516cv500.mk @@ -10,9 +10,6 @@ HISILICON_OSDRV_HI3516CV500_LICENSE = MIT HISILICON_OSDRV_HI3516CV500_LICENSE_FILES = LICENSE define HISILICON_OSDRV_HI3516CV500_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv500/files/sensor/config/*.ini diff --git a/general/package/hisilicon-osdrv-hi3516ev200/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3516ev200/files/script/S95hisilicon deleted file mode 100755 index f3b4d652..00000000 --- a/general/package/hisilicon-osdrv-hi3516ev200/files/script/S95hisilicon +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t hisilicon "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_hisilicon -i - # - export SENSOR=$(fw_printenv -n sensor) - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/hisilicon-osdrv-hi3516ev200/hisilicon-osdrv-hi3516ev200.mk b/general/package/hisilicon-osdrv-hi3516ev200/hisilicon-osdrv-hi3516ev200.mk index 050c17b1..1e3668eb 100644 --- a/general/package/hisilicon-osdrv-hi3516ev200/hisilicon-osdrv-hi3516ev200.mk +++ b/general/package/hisilicon-osdrv-hi3516ev200/hisilicon-osdrv-hi3516ev200.mk @@ -10,9 +10,6 @@ HISILICON_OSDRV_HI3516EV200_LICENSE = MIT HISILICON_OSDRV_HI3516EV200_LICENSE_FILES = LICENSE define HISILICON_OSDRV_HI3516EV200_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev200/files/script/S95hisilicon - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev200/files/sensor/config/*.ini @@ -30,7 +27,7 @@ define HISILICON_OSDRV_HI3516EV200_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev200/files/kmod/hi3516ev200_isp.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev200/files/script/load_hisilicon + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev200/files/script/load* $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev200/files/script/ircut_demo $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev200/files/script/set_allocator diff --git a/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon deleted file mode 100755 index f3b4d652..00000000 --- a/general/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t hisilicon "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t hisilicon "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t hisilicon "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t hisilicon "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t hisilicon "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_hisilicon -i - # - export SENSOR=$(fw_printenv -n sensor) - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/hisilicon-osdrv-hi3519v101/hisilicon-osdrv-hi3519v101.mk b/general/package/hisilicon-osdrv-hi3519v101/hisilicon-osdrv-hi3519v101.mk index 985c236e..14ac8450 100644 --- a/general/package/hisilicon-osdrv-hi3519v101/hisilicon-osdrv-hi3519v101.mk +++ b/general/package/hisilicon-osdrv-hi3519v101/hisilicon-osdrv-hi3519v101.mk @@ -10,9 +10,6 @@ HISILICON_OSDRV_HI3519V101_LICENSE = MIT HISILICON_OSDRV_HI3519V101_LICENSE_FILES = LICENSE define HISILICON_OSDRV_HI3519V101_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3519v101/files/sensor/config/*.ini @@ -60,7 +57,7 @@ define HISILICON_OSDRV_HI3519V101_INSTALL_TARGET_CMDS # $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.18.20/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3519v101/files/kmod/hi_user.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3519v101/files/script/load_hisilicon + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3519v101/files/script/load* $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3519v101/files/script/ircut_demo $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/lib/libhdmi.so b/general/package/hisilicon-osdrv-hi3536dv100/files/lib/libhdmi.so old mode 100755 new mode 100644 diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/lib/libjpeg6b.so b/general/package/hisilicon-osdrv-hi3536dv100/files/lib/libjpeg6b.so old mode 100755 new mode 100644 diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/lib/libmpi.so b/general/package/hisilicon-osdrv-hi3536dv100/files/lib/libmpi.so old mode 100755 new mode 100644 diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/lib/libtde.so b/general/package/hisilicon-osdrv-hi3536dv100/files/lib/libtde.so old mode 100755 new mode 100644 diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/script/S95hisilicon b/general/package/hisilicon-osdrv-hi3536dv100/files/script/S95hisilicon deleted file mode 100755 index 7432e974..00000000 --- a/general/package/hisilicon-osdrv-hi3536dv100/files/script/S95hisilicon +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -start() { - load_hisilicon -i -} - -stop() { - load_hisilicon -r -} - -restart() { - stop - sleep 1 - reload -} - -case "$1" in - start|stop) - "$1";; - *) - echo "Usage: $0 {start|stop}" - exit 1 -esac diff --git a/general/package/hisilicon-osdrv-hi3536dv100/hisilicon-osdrv-hi3536dv100.mk b/general/package/hisilicon-osdrv-hi3536dv100/hisilicon-osdrv-hi3536dv100.mk index e4e42e7b..6c293630 100644 --- a/general/package/hisilicon-osdrv-hi3536dv100/hisilicon-osdrv-hi3536dv100.mk +++ b/general/package/hisilicon-osdrv-hi3536dv100/hisilicon-osdrv-hi3536dv100.mk @@ -10,13 +10,9 @@ HISILICON_OSDRV_HI3536DV100_LICENSE = MIT HISILICON_OSDRV_HI3536DV100_LICENSE_FILES = LICENSE define HISILICON_OSDRV_HI3536DV100_INSTALL_TARGET_CMDS - # - Init script - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3536dv100/files/script/S95hisilicon - # - Loader $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3536dv100/files/script/load_hisilicon + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3536dv100/files/script/load* # - Kernel modules $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.37/hisilicon @@ -68,7 +64,6 @@ define HISILICON_OSDRV_HI3536DV100_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3536dv100/files/lib/libVoiceEngine.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3536dv100/files/lib/libhive_HPF.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3536dv100/files/lib/libaacdec.so - endef $(eval $(generic-package)) diff --git a/general/package/ingenic-osdrv-t20/files/script/S95ingenic b/general/package/ingenic-osdrv-t20/files/script/S95ingenic deleted file mode 100755 index 14d9d1e1..00000000 --- a/general/package/ingenic-osdrv-t20/files/script/S95ingenic +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t ingenic "Check MAC for Ingenic devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t ingenic "The eth0 interface has a lousy MAC, please change it.." - else - logger -s -p daemon.info -t ingenic "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t ingenic "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_ingenic - # - # - # export SENSOR=$(fw_printenv -n sensor) - export SENSOR=$(cat /proc/jz/sinfo/info | sed -e 's/.*://') - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in -start | stop | restart | reload) - "$1" - ;; -*) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/general/package/ingenic-osdrv-t20/files/script/load_ingenic b/general/package/ingenic-osdrv-t20/files/script/load_ingenic index 9e1ad815..df34cad1 100755 --- a/general/package/ingenic-osdrv-t20/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t20/files/script/load_ingenic @@ -1,10 +1,20 @@ #!/bin/sh -KMOD_PATH=/lib/modules/3.10.14/ingenic +KMOD_PATH=/lib/modules/$(uname -r)/ingenic +vendor=$(ipcinfo -v) + +if [ ! -f /usr/sbin/sensor_cli ]; then + ln -s /usr/sbin/extutils /usr/sbin/sensor_cli +fi + SOC=$(ipcinfo --chip-name || fw_printenv -n soc) echo 1 >/proc/sys/vm/overcommit_memory +log_vendor() { + logger -s -p daemon.info -t ${vendor} "$1" +} + check_return() { if [ $? -ne 0 ]; then echo err: $1 @@ -18,18 +28,23 @@ if [ $? -ne 0 ]; then insmod ${KMOD_PATH/%\//}/sinfo.ko check_return "insmod sinfo" fi -echo 1 >/proc/jz/sinfo/info -check_return "start sinfo" if fw_printenv -n sensor >/dev/null; then export SENSOR=$(fw_printenv -n sensor) - logger -s -p daemon.info -t ingenic "Get data from environment and set SENSOR as ${SENSOR}" + log_vendor "Get data from environment and set SENSOR as ${SENSOR}" else - SENSOR_INFO=$(cat /proc/jz/sinfo/info) - check_return "get sensor type" - SENSOR=${SENSOR_INFO#*:} - logger -s -p daemon.info -t ingenic "Get data from sinfo and set SENSOR as ${SENSOR}" - fw_setenv sensor $SENSOR && logger -s -p daemon.info -t ingenic "Write detected ${SENSOR} to U-Boot ENV" + echo 1 >/proc/jz/sinfo/info + check_return "start sinfo" + SENSOR_INFO=$(cat /proc/jz/sinfo/info) + check_return "get sensor type" + SENSOR=${SENSOR_INFO#*:} + if [ "sensor not found" = "$SENSOR" ]; then + unset SENSOR + fw_setenv sensor + else + log_vendor "Get data from sinfo and set SENSOR as ${SENSOR}" + fw_setenv sensor $SENSOR && log_vendor "Write detected ${SENSOR} to U-Boot ENV" + fi fi case ${SENSOR} in diff --git a/general/package/ingenic-osdrv-t20/ingenic-osdrv-t20.mk b/general/package/ingenic-osdrv-t20/ingenic-osdrv-t20.mk index 279e4b90..083a707b 100644 --- a/general/package/ingenic-osdrv-t20/ingenic-osdrv-t20.mk +++ b/general/package/ingenic-osdrv-t20/ingenic-osdrv-t20.mk @@ -10,9 +10,6 @@ INGENIC_OSDRV_T20_LICENSE = MIT INGENIC_OSDRV_T20_LICENSE_FILES = LICENSE define INGENIC_OSDRV_T20_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t20/files/script/S95ingenic - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t20/files/sensor/*.yaml # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t20/files/sensor/params/*.bin diff --git a/general/package/ingenic-osdrv-t21/files/script/S95ingenic b/general/package/ingenic-osdrv-t21/files/script/S95ingenic deleted file mode 100755 index 887774a4..00000000 --- a/general/package/ingenic-osdrv-t21/files/script/S95ingenic +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t ingenic "Check MAC for Ingenic devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t ingenic "The eth0 interface has a lousy MAC, please change it.." - else - logger -s -p daemon.info -t ingenic "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t ingenic "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_ingenic - # - # - # export SENSOR=$(fw_printenv -n sensor) - export SENSOR=$(cat /proc/jz/sinfo/info | sed -e 's/.*://') - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - diff --git a/general/package/ingenic-osdrv-t21/files/script/load_ingenic b/general/package/ingenic-osdrv-t21/files/script/load_ingenic index e9b3f876..aa4a6314 100755 --- a/general/package/ingenic-osdrv-t21/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t21/files/script/load_ingenic @@ -1,10 +1,20 @@ #!/bin/sh -KMOD_PATH=/lib/modules/3.10.14__isvp_turkey_1.0__/ingenic +KMOD_PATH=/lib/modules/$(uname -r)/ingenic +vendor=$(ipcinfo -v) + +if [ ! -f /usr/sbin/sensor_cli ]; then + ln -s /usr/sbin/extutils /usr/sbin/sensor_cli +fi + SOC=$(ipcinfo --chip-name || fw_printenv -n soc) echo 1 >/proc/sys/vm/overcommit_memory +log_vendor() { + logger -s -p daemon.info -t ${vendor} "$1" +} + check_return() { if [ $? -ne 0 ]; then echo err: $1 @@ -18,18 +28,23 @@ if [ $? -ne 0 ]; then insmod ${KMOD_PATH/%\//}/sinfo.ko check_return "insmod sinfo" fi -echo 1 >/proc/jz/sinfo/info -check_return "start sinfo" if fw_printenv -n sensor >/dev/null; then export SENSOR=$(fw_printenv -n sensor) - logger -s -p daemon.info -t ingenic "Get data from environment and set SENSOR as ${SENSOR}" + log_vendor "Get data from environment and set SENSOR as ${SENSOR}" else + echo 1 >/proc/jz/sinfo/info + check_return "start sinfo" SENSOR_INFO=$(cat /proc/jz/sinfo/info) check_return "get sensor type" SENSOR=${SENSOR_INFO#*:} - logger -s -p daemon.info -t ingenic "Get data from sinfo and set SENSOR as ${SENSOR}" - fw_setenv sensor $SENSOR && logger -s -p daemon.info -t ingenic "Write detected ${SENSOR} to U-Boot ENV" + if [ "sensor not found" = "$SENSOR" ]; then + unset SENSOR + fw_setenv sensor + else + log_vendor "Get data from sinfo and set SENSOR as ${SENSOR}" + fw_setenv sensor $SENSOR && log_vendor "Write detected ${SENSOR} to U-Boot ENV" + fi fi case ${SENSOR} in @@ -84,14 +99,14 @@ if [ $? -ne 0 ]; then check_return "insmod isp drv" fi -lsmod | grep "audio" >/dev/null -if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/audio.ko - check_return "insmod audio" -fi - lsmod | grep ${SENSOR} >/dev/null if [ $? -ne 0 ]; then insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_${SOC}.ko ${SENSOR_PARAM} check_return "insmod sensor drv" fi + +lsmod | grep "audio" >/dev/null +if [ $? -ne 0 ]; then + insmod ${KMOD_PATH/%\//}/audio.ko + check_return "insmod audio" +fi diff --git a/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk b/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk index 940e58c7..5e2090ae 100644 --- a/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk +++ b/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk @@ -10,9 +10,6 @@ INGENIC_OSDRV_T21_LICENSE = MIT INGENIC_OSDRV_T21_LICENSE_FILES = LICENSE define INGENIC_OSDRV_T21_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t21/files/script/S95ingenic - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t21/files/sensor/*.yaml # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t21/files/sensor/params/*.bin @@ -53,7 +50,6 @@ define INGENIC_OSDRV_T21_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t21/files/script/load* # $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t21/files/script/ircut_demo - # $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t21/files/sample/* # $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors/params # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors/params $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t21/files/sensor/params/*.bin diff --git a/general/package/ingenic-osdrv-t30/files/script/S95ingenic b/general/package/ingenic-osdrv-t30/files/script/S95ingenic deleted file mode 100755 index 005dc6bf..00000000 --- a/general/package/ingenic-osdrv-t30/files/script/S95ingenic +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t ingenic "Check MAC for Ingenic devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t ingenic "The eth0 interface has a lousy MAC, please change it.." - else - logger -s -p daemon.info -t ingenic "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t ingenic "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_ingenic - # - # - # export SENSOR=$(fw_printenv -n sensor) - export SENSOR=$(cat /proc/jz/sinfo/info | sed -e 's/.*://') - SENSOR=$(cat /proc/jz/sinfo/info | sed -e 's/.*://') - if [ "sensor not found" = "$SENSOR" ]; then - unset SENSOR - else - export SENSOR=$SENSOR - fi - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/ingenic-osdrv-t30/files/script/load_ingenic b/general/package/ingenic-osdrv-t30/files/script/load_ingenic index 20928039..3a3ffd15 100755 --- a/general/package/ingenic-osdrv-t30/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t30/files/script/load_ingenic @@ -1,9 +1,18 @@ #!/bin/sh -KMOD_PATH=/lib/modules/3.10.14__isvp_monkey_1.0__/ingenic +KMOD_PATH=/lib/modules/$(uname -r)/ingenic +vendor=$(ipcinfo -v) + +if [ ! -f /usr/sbin/sensor_cli ]; then + ln -s /usr/sbin/extutils /usr/sbin/sensor_cli +fi echo 1 >/proc/sys/vm/overcommit_memory +log_vendor() { + logger -s -p daemon.info -t ${vendor} "$1" +} + check_return() { if [ $? -ne 0 ]; then echo err: $1 @@ -17,13 +26,13 @@ if [ $? -ne 0 ]; then insmod ${KMOD_PATH/%\//}/sinfo.ko check_return "insmod sinfo" fi -echo 1 >/proc/jz/sinfo/info -check_return "start sinfo" if fw_printenv -n sensor >/dev/null; then export SENSOR=$(fw_printenv -n sensor) - logger -s -p daemon.info -t ingenic "Get data from environment and set SENSOR as ${SENSOR}" + log_vendor "Get data from environment and set SENSOR as ${SENSOR}" else + echo 1 >/proc/jz/sinfo/info + check_return "start sinfo" SENSOR_INFO=$(cat /proc/jz/sinfo/info) check_return "get sensor type" SENSOR=${SENSOR_INFO#*:} @@ -31,8 +40,8 @@ else unset SENSOR fw_setenv sensor else - logger -s -p daemon.info -t ingenic "Get data from sinfo and set SENSOR as ${SENSOR}" - fw_setenv sensor $SENSOR && logger -s -p daemon.info -t ingenic "Write detected ${SENSOR} to U-Boot ENV" + log_vendor "Get data from sinfo and set SENSOR as ${SENSOR}" + fw_setenv sensor $SENSOR && log_vendor "Write detected ${SENSOR} to U-Boot ENV" fi fi @@ -57,21 +66,20 @@ if [ $? -ne 0 ]; then check_return "insmod isp drv" fi +lsmod | grep ${SENSOR} >/dev/null +if [ $? -ne 0 ]; then + insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_t30.ko ${SENSOR_PARAM} + check_return "insmod sensor drv" +fi + lsmod | grep "audio" >/dev/null if [ $? -ne 0 ]; then insmod ${KMOD_PATH/%\//}/audio.ko check_return "insmod audio" fi -lsmod | grep ${SENSOR} >/dev/null -if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_t30.ko ${SENSOR_PARAM} - check_return "insmod sensor drv" -fi -# -# Need for claim gpio 57,58 on HICHIP (CamHi/Xin) boards +# Need for claim gpio insmod ${KMOD_PATH/%\//}/gpio.ko echo $(yaml-cli -i /etc/majestic.yaml -g .nightMode.irCutPin1) >/proc/jz/claim/gpio echo $(yaml-cli -i /etc/majestic.yaml -g .nightMode.irCutPin2) >/proc/jz/claim/gpio # echo $(yaml-cli -i /etc/majestic.yaml -g .nightMode.irSensorPin) >/proc/jz/claim/gpio -# diff --git a/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk b/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk index d20c8536..bbdd6184 100644 --- a/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk +++ b/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk @@ -10,9 +10,6 @@ INGENIC_OSDRV_T30_LICENSE = MIT INGENIC_OSDRV_T30_LICENSE_FILES = LICENSE define INGENIC_OSDRV_T30_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t30/files/script/S95ingenic - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t30/files/sensor/*.yaml # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t30/files/sensor/params/bg0806.bin diff --git a/general/package/ingenic-osdrv-t31/files/script/S95ingenic b/general/package/ingenic-osdrv-t31/files/script/S95ingenic deleted file mode 100755 index 005dc6bf..00000000 --- a/general/package/ingenic-osdrv-t31/files/script/S95ingenic +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t ingenic "Check MAC for Ingenic devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t ingenic "The eth0 interface has a lousy MAC, please change it.." - else - logger -s -p daemon.info -t ingenic "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t ingenic "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_ingenic - # - # - # export SENSOR=$(fw_printenv -n sensor) - export SENSOR=$(cat /proc/jz/sinfo/info | sed -e 's/.*://') - SENSOR=$(cat /proc/jz/sinfo/info | sed -e 's/.*://') - if [ "sensor not found" = "$SENSOR" ]; then - unset SENSOR - else - export SENSOR=$SENSOR - fi - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/ingenic-osdrv-t31/files/script/load_ingenic b/general/package/ingenic-osdrv-t31/files/script/load_ingenic index cce764d0..e53d58c4 100755 --- a/general/package/ingenic-osdrv-t31/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t31/files/script/load_ingenic @@ -1,9 +1,18 @@ #!/bin/sh -KMOD_PATH=/lib/modules/3.10.14__isvp_swan_1.0__/ingenic +KMOD_PATH=/lib/modules/$(uname -r)/ingenic +vendor=$(ipcinfo -v) + +if [ ! -f /usr/sbin/sensor_cli ]; then + ln -s /usr/sbin/extutils /usr/sbin/sensor_cli +fi echo 1 >/proc/sys/vm/overcommit_memory +log_vendor() { + logger -s -p daemon.info -t ${vendor} "$1" +} + check_return() { if [ $? -ne 0 ]; then echo err: $1 @@ -12,24 +21,40 @@ check_return() { fi } -lsmod | grep "avpu" >/dev/null -if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/avpu.ko clk_name='vpll' avpu_clk=400000000 - check_return "insmod avpu" -fi +SENSOR_EXT_PARAM="" + +sync_sensor_param() { + STREAMER_RES=$(cli -g .video0.size) + STREAMER_FPS=$(cli -g .video0.fps) + if [ ! -z "${STREAMER_RES}" ] && [ ! -z "${STREAMER_FPS}" ]; then + CUR_SENSOR_RES="$(sensor_cli -g .sensor.width)x$(sensor_cli -g .sensor.height)" + if ! [ "${CUR_SENSOR_RES}" = "${STREAMER_RES}" ]; then + STREAMER_PARAM="${STREAMER_RES}x${STREAMER_FPS}" + RES_LIST=$(sensor_cli -g .sensor.resolutions) + for RES in $(echo ${RES_LIST} | tr ',' '\n') + do + if [ "$(echo ${RES} | cut -d "_" -f1)" = "${STREAMER_PARAM}" ]; then + sensor_cli -s .sensor.width $(echo ${STREAMER_PARAM} | cut -d "x" -f1) + sensor_cli -s .sensor.height $(echo ${STREAMER_PARAM} | cut -d "x" -f2) + SENSOR_EXT_PARAM="sensor_resolution=$(echo ${RES} | cut -d "_" -f2) sensor_max_fps=$(echo ${STREAMER_FPS})" + fi + done + fi + fi +} lsmod | grep "sinfo" >/dev/null if [ $? -ne 0 ]; then insmod ${KMOD_PATH/%\//}/sinfo.ko check_return "insmod sinfo" fi -echo 1 >/proc/jz/sinfo/info -check_return "start sinfo" if fw_printenv -n sensor >/dev/null; then export SENSOR=$(fw_printenv -n sensor) - logger -s -p daemon.info -t ingenic "Get data from environment and set SENSOR as ${SENSOR}" + log_vendor "Get data from environment and set SENSOR as ${SENSOR}" else + echo 1 >/proc/jz/sinfo/info + check_return "start sinfo" SENSOR_INFO=$(cat /proc/jz/sinfo/info) check_return "get sensor type" SENSOR=${SENSOR_INFO#*:} @@ -37,62 +62,81 @@ else unset SENSOR fw_setenv sensor else - logger -s -p daemon.info -t ingenic "Get data from sinfo and set SENSOR as ${SENSOR}" - fw_setenv sensor $SENSOR && logger -s -p daemon.info -t ingenic "Write detected ${SENSOR} to U-Boot ENV" + log_vendor "Get data from sinfo and set SENSOR as ${SENSOR}" + fw_setenv sensor $SENSOR && log_vendor "Write detected ${SENSOR} to U-Boot ENV" fi fi +sync_sensor_param case ${SENSOR} in "gc2053") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="sensor_max_fps=25 data_interface=1" + SENSOR_PARAM="data_interface=1" ;; "gc2083") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=200000000" SENSOR_PARAM="shvflip=1" ;; "gc4653") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=200000000" SENSOR_PARAM="" ;; "imx307") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=125000000" SENSOR_PARAM="" ;; "jxf37") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=200000000 isp_memopt=1 isp_day_night_switch_drop_frame_num=1 isp_ch0_pre_dequeue_time=12 isp_ch0_pre_dequeue_interrupt_process=0 isp_ch0_pre_dequeue_valid_lines=540" SENSOR_PARAM="shvflip=1" ;; "jxh62") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="" SENSOR_PARAM="" ;; "jxq03"|"jxq03p") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=150000000" SENSOR_PARAM="" ;; "sc200ai") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=100000000 isp_ch0_pre_dequeue_time=20 isp_ch0_pre_dequeue_interrupt_process=0 isp_memopt=1" SENSOR_PARAM="shvflip=1" ;; "sc2232") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=125000000" SENSOR_PARAM="" ;; "sc2335") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=100000000 isp_ch0_pre_dequeue_time=20 isp_ch0_pre_dequeue_interrupt_process=0 isp_memopt=1" SENSOR_PARAM="" ;; +"sc3335") + AVPU_PARAM="clk_name=mpll avpu_clk=500000000" + ISP_PARAM="isp_clk=200000000 isp_memopt=1" + SENSOR_PARAM="" + ;; "sc3338") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=150000000" SENSOR_PARAM="" ;; "sc5235") + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=200000000" SENSOR_PARAM="" ;; *) + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" ISP_PARAM="isp_clk=125000000" SENSOR_PARAM="" break @@ -100,32 +144,38 @@ case ${SENSOR} in esac echo -------------------- +echo "AVPU_PARAM: ${AVPU_PARAM}" echo "ISP_PARAM: ${ISP_PARAM}" echo "SENSOR: ${SENSOR}" echo "SENSOR_PARAM: ${SENSOR_PARAM}" echo -------------------- +lsmod | grep "avpu" >/dev/null +if [ $? -ne 0 ]; then + insmod ${KMOD_PATH/%\//}/avpu.ko ${AVPU_PARAM} + check_return "insmod avpu" +fi + lsmod | grep "tx_isp" >/dev/null if [ $? -ne 0 ]; then insmod ${KMOD_PATH/%\//}/tx-isp-t31.ko ${ISP_PARAM} check_return "insmod isp drv" fi +lsmod | grep ${SENSOR} >/dev/null +if [ $? -ne 0 ]; then + insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_t31.ko ${SENSOR_PARAM} ${SENSOR_EXT_PARAM} + check_return "insmod sensor drv" +fi + lsmod | grep "audio" >/dev/null if [ $? -ne 0 ]; then insmod ${KMOD_PATH/%\//}/audio.ko check_return "insmod audio" fi -lsmod | grep ${SENSOR} >/dev/null -if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_t31.ko ${SENSOR_PARAM} - check_return "insmod sensor drv" -fi -# -# Need for claim gpio 57,58 on HICHIP (CamHi/Xin) boards +# Need for claim gpio insmod ${KMOD_PATH/%\//}/gpio.ko -echo $(yaml-cli -i /etc/majestic.yaml -g .nightMode.irCutPin1) >/proc/jz/claim/gpio -echo $(yaml-cli -i /etc/majestic.yaml -g .nightMode.irCutPin2) >/proc/jz/claim/gpio -# echo $(yaml-cli -i /etc/majestic.yaml -g .nightMode.irSensorPin) >/proc/jz/claim/gpio -# +echo $(cli -g .nightMode.irCutPin1) >/proc/jz/claim/gpio +echo $(cli -g .nightMode.irCutPin2) >/proc/jz/claim/gpio +# echo $(cli -g .nightMode.irSensorPin) >/proc/jz/claim/gpio diff --git a/general/package/ingenic-osdrv-t31/files/sensor/gc4653.yaml b/general/package/ingenic-osdrv-t31/files/sensor/gc4653.yaml index 79ee5693..516518d2 100644 --- a/general/package/ingenic-osdrv-t31/files/sensor/gc4653.yaml +++ b/general/package/ingenic-osdrv-t31/files/sensor/gc4653.yaml @@ -4,3 +4,4 @@ sensor: width: 2560 height: 1440 bus: i2c + resolutions: 2560x1440x25_400,1920x1080x60_300,1280x720x60_100 diff --git a/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk b/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk index c5f5b08d..e1cab09d 100644 --- a/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk +++ b/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk @@ -10,9 +10,6 @@ INGENIC_OSDRV_T31_LICENSE = MIT INGENIC_OSDRV_T31_LICENSE_FILES = LICENSE define INGENIC_OSDRV_T31_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/script/S95ingenic - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/sensor/*.yaml # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/sensor/params/*.bin @@ -57,7 +54,6 @@ define INGENIC_OSDRV_T31_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/script/load* $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/script/ircut_demo - # $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/sample/* # $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors/params # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors/params $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/files/sensor/params/*.bin diff --git a/general/package/ingenic-osdrv-t40/files/script/S95ingenic b/general/package/ingenic-osdrv-t40/files/script/S95ingenic deleted file mode 100755 index 005dc6bf..00000000 --- a/general/package/ingenic-osdrv-t40/files/script/S95ingenic +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t ingenic "Check MAC for Ingenic devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t ingenic "The eth0 interface has a lousy MAC, please change it.." - else - logger -s -p daemon.info -t ingenic "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t ingenic "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_ingenic - # - # - # export SENSOR=$(fw_printenv -n sensor) - export SENSOR=$(cat /proc/jz/sinfo/info | sed -e 's/.*://') - SENSOR=$(cat /proc/jz/sinfo/info | sed -e 's/.*://') - if [ "sensor not found" = "$SENSOR" ]; then - unset SENSOR - else - export SENSOR=$SENSOR - fi - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/ingenic-osdrv-t40/files/script/load_ingenic b/general/package/ingenic-osdrv-t40/files/script/load_ingenic index a621c74b..8372d53f 100755 --- a/general/package/ingenic-osdrv-t40/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t40/files/script/load_ingenic @@ -1,9 +1,18 @@ #!/bin/sh -KMOD_PATH=/lib/modules/4.4.94/ingenic +KMOD_PATH=/lib/modules/$(uname -r)/ingenic +vendor=$(ipcinfo -v) + +if [ ! -f /usr/sbin/sensor_cli ]; then + ln -s /usr/sbin/extutils /usr/sbin/sensor_cli +fi echo 1 >/proc/sys/vm/overcommit_memory +log_vendor() { + logger -s -p daemon.info -t ${vendor} "$1" +} + check_return() { if [ $? -ne 0 ]; then echo err: $1 @@ -17,22 +26,22 @@ if [ $? -ne 0 ]; then insmod ${KMOD_PATH/%\//}/sinfo.ko check_return "insmod sinfo" fi -echo 1 >/proc/jz/sinfo/info -check_return "start sinfo" if fw_printenv -n sensor >/dev/null; then export SENSOR=$(fw_printenv -n sensor) - logger -s -p daemon.info -t ingenic "Get data from environment and set SENSOR as ${SENSOR}" + log_vendor "Get data from environment and set SENSOR as ${SENSOR}" else - SENSOR_INFO=$(cat /proc/jz/sinfo/info) - check_return "get sensor type" - SENSOR=${SENSOR_INFO#*:} + echo 1 >/proc/jz/sinfo/info + check_return "start sinfo" + SENSOR_INFO=$(cat /proc/jz/sinfo/info) + check_return "get sensor type" + SENSOR=${SENSOR_INFO#*:} if [ "sensor not found" = "$SENSOR" ]; then unset SENSOR fw_setenv sensor else - logger -s -p daemon.info -t ingenic "Get data from sinfo and set SENSOR as ${SENSOR}" - fw_setenv sensor $SENSOR && logger -s -p daemon.info -t ingenic "Write detected ${SENSOR} to U-Boot ENV" + log_vendor "Get data from sinfo and set SENSOR as ${SENSOR}" + fw_setenv sensor $SENSOR && log_vendor "Write detected ${SENSOR} to U-Boot ENV" fi fi @@ -79,21 +88,20 @@ if [ $? -ne 0 ]; then check_return "insmod isp drv" fi +lsmod | grep ${SENSOR} >/dev/null +if [ $? -ne 0 ]; then + insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_t40.ko ${SENSOR_PARAM} + check_return "insmod sensor drv" +fi + lsmod | grep "audio" >/dev/null if [ $? -ne 0 ]; then insmod ${KMOD_PATH/%\//}/audio.ko check_return "insmod audio" fi -lsmod | grep ${SENSOR} >/dev/null -if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_t40.ko ${SENSOR_PARAM} - check_return "insmod sensor drv" -fi -# # Need for claim gpio insmod ${KMOD_PATH/%\//}/gpio.ko echo $(yaml-cli -i /etc/majestic.yaml -g .nightMode.irCutPin1) >/proc/jz/claim/gpio echo $(yaml-cli -i /etc/majestic.yaml -g .nightMode.irCutPin2) >/proc/jz/claim/gpio # echo $(yaml-cli -i /etc/majestic.yaml -g .nightMode.irSensorPin) >/proc/jz/claim/gpio -# diff --git a/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk b/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk index 5b3af4da..b79f27ad 100644 --- a/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk +++ b/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk @@ -10,9 +10,6 @@ INGENIC_OSDRV_T40_LICENSE = MIT INGENIC_OSDRV_T40_LICENSE_FILES = LICENSE define INGENIC_OSDRV_T40_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t40/files/script/S95ingenic - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t40/files/sensor/*.yaml diff --git a/general/package/goke-osdrv-gk710x/files/script/S95goke b/general/package/majestic/files/S95majestic similarity index 64% rename from general/package/goke-osdrv-gk710x/files/script/S95goke rename to general/package/majestic/files/S95majestic index 91ef0680..cca0ace3 100755 --- a/general/package/goke-osdrv-gk710x/files/script/S95goke +++ b/general/package/majestic/files/S95majestic @@ -14,11 +14,10 @@ load_majestic() { # shellcheck disable=SC2086 # we need the word splitting [ -f /etc/coredump.conf ] && . /etc/coredump.conf if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 + [ "$(cli -g .watchdog.timeout)" -lt "30" ] && cli -s .watchdog.timeout 30 ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" -- $DAEMON_ARGS status=$? if [ "$status" -eq 0 ]; then echo "OK" @@ -30,18 +29,9 @@ load_majestic() { # The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. start() { - logger -s -p daemon.info -t goke "Checking MAC address" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t goke "The eth0 interface has a lousy MAC, you have to change it.." - else - logger -s -p daemon.info -t goke "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t goke "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - # load_goke - # - # load_majestic + logger -s -p daemon.info -t $(ipcinfo -v) "Loading video system has started..." + export SENSOR=$(fw_printenv -n sensor) + load_majestic } stop() { diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index 085f9335..50fde59b 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -44,6 +44,9 @@ define MAJESTIC_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic + + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d + cp ../general/package/majestic/files/S95majestic $(TARGET_DIR)/etc/init.d endef $(eval $(generic-package)) diff --git a/general/package/novatek-osdrv-nt9856x/files/script/S95novatek b/general/package/novatek-osdrv-nt9856x/files/script/S95novatek deleted file mode 100755 index 024fecca..00000000 --- a/general/package/novatek-osdrv-nt9856x/files/script/S95novatek +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t novatek "Check MAC for Novatek devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t novatek "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t novatek "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t novatek "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t novatek "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_novatek -i - # - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/novatek-osdrv-nt9856x/novatek-osdrv-nt9856x.mk b/general/package/novatek-osdrv-nt9856x/novatek-osdrv-nt9856x.mk index 0b7ccd00..a7ac4ad1 100644 --- a/general/package/novatek-osdrv-nt9856x/novatek-osdrv-nt9856x.mk +++ b/general/package/novatek-osdrv-nt9856x/novatek-osdrv-nt9856x.mk @@ -10,9 +10,6 @@ NOVATEK_OSDRV_NT9856X_LICENSE = MIT NOVATEK_OSDRV_NT9856X_LICENSE_FILES = LICENSE define NOVATEK_OSDRV_NT9856X_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_NOVATEK_PATH)/package/novatek-osdrv-nt9856x/files/script/S95novatek - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_NOVATEK_PATH)/package/novatek-osdrv-nt9856x/files/sensor/config/sen_sc*.cfg $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_NOVATEK_PATH)/package/novatek-osdrv-nt9856x/files/sensor/*.yaml diff --git a/general/package/rockchip-osdrv-rv11xx/files/script/S95rockchip b/general/package/rockchip-osdrv-rv11xx/files/script/S95rockchip deleted file mode 100755 index 1df0ffb8..00000000 --- a/general/package/rockchip-osdrv-rv11xx/files/script/S95rockchip +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t rockchip "Check MAC for rockchip devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t rockchip "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t rockchip "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t rockchip "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t rockchip "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - #load_rockchip - # - export SENSOR=$(fw_printenv -n sensor) - #load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - diff --git a/general/package/rockchip-osdrv-rv11xx/files/script/load_rockchip b/general/package/rockchip-osdrv-rv11xx/files/script/load_rockchip index e69de29b..1a248525 100755 --- a/general/package/rockchip-osdrv-rv11xx/files/script/load_rockchip +++ b/general/package/rockchip-osdrv-rv11xx/files/script/load_rockchip @@ -0,0 +1 @@ +#!/bin/sh diff --git a/general/package/rockchip-osdrv-rv11xx/rockchip-osdrv-rv11xx.mk b/general/package/rockchip-osdrv-rv11xx/rockchip-osdrv-rv11xx.mk index 4a07fb91..36153efc 100644 --- a/general/package/rockchip-osdrv-rv11xx/rockchip-osdrv-rv11xx.mk +++ b/general/package/rockchip-osdrv-rv11xx/rockchip-osdrv-rv11xx.mk @@ -10,9 +10,6 @@ ROCKCHIP_OSDRV_RV11XX_LICENSE = MIT ROCKCHIP_OSDRV_RV11XX_LICENSE_FILES = LICENSE define ROCKCHIP_OSDRV_RV11XX_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/rockchip-osdrv-rv11xx/files/script/S95rockchip - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/rockchip-osdrv-rv11xx/files/sensor/config/* @@ -21,7 +18,6 @@ define ROCKCHIP_OSDRV_RV11XX_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/rockchip-osdrv-rv11xx/files/script/load* - # $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/rockchip-osdrv-rv11xx/files/sample/* $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/rockchip-osdrv-rv11xx/files/sensor/*.so diff --git a/general/package/sigmastar-osdrv-infinity6e/files/script/init.d/S80sigmastar b/general/package/sigmastar-osdrv-infinity6e/files/script/init.d/S80sigmastar deleted file mode 100755 index d3e552e0..00000000 --- a/general/package/sigmastar-osdrv-infinity6e/files/script/init.d/S80sigmastar +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" -DAEMON_ARGS="-s" - -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t sigmastar "Check MAC for Sigmastar devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t sigmastar "The eth0 interface has a lousy MAC, let's try to change it.." - else - logger -s -p daemon.info -t sigmastar "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - logger -s -p daemon.info -t sigmastar "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_sigmastar - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1" - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk b/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk index 7eaf9508..3aba48d8 100644 --- a/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk +++ b/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk @@ -15,9 +15,6 @@ define SIGMASTAR_OSDRV_INFINITY6E_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(SIGMASTAR_OSDRV_INFINITY6E_PATH)/script/bin/* - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(SIGMASTAR_OSDRV_INFINITY6E_PATH)/script/init.d/* - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6E_PATH)/kmod/*.ko $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6E_PATH)/sensor/kmod/*.ko diff --git a/general/package/sigmastar-osdrv-msc313e/files/script/S95sigmastar b/general/package/sigmastar-osdrv-msc313e/files/script/S95sigmastar deleted file mode 100755 index 076d7e18..00000000 --- a/general/package/sigmastar-osdrv-msc313e/files/script/S95sigmastar +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t sigmastar "Check MAC for Sigmastar devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t sigmastar "The eth0 interface has a lousy MAC, let's try to change it.." - else - logger -s -p daemon.info -t sigmastar "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t sigmastar "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - #load_sigmastar -i - # - #load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac \ No newline at end of file diff --git a/general/package/sigmastar-osdrv-msc313e/sigmastar-osdrv-msc313e.mk b/general/package/sigmastar-osdrv-msc313e/sigmastar-osdrv-msc313e.mk index 0bfe2849..2456792f 100644 --- a/general/package/sigmastar-osdrv-msc313e/sigmastar-osdrv-msc313e.mk +++ b/general/package/sigmastar-osdrv-msc313e/sigmastar-osdrv-msc313e.mk @@ -10,9 +10,6 @@ SIGMASTAR_OSDRV_MSC313E_LICENSE = MIT SIGMASTAR_OSDRV_MSC313E_LICENSE_FILES = LICENSE define SIGMASTAR_OSDRV_MSC313E_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar-osdrv-msc313e/files/script/S95sigmastar - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/iqfile $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iqfile $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar-osdrv-msc313e/files/sensor/iqfile/*.xml $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iqfile $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar-osdrv-msc313e/files/sensor/iqfile/f22*.mz diff --git a/general/package/sigmastar-osdrv-ssc335/files/script/S95sigmastar b/general/package/sigmastar-osdrv-ssc335/files/script/S95sigmastar deleted file mode 100755 index 35480876..00000000 --- a/general/package/sigmastar-osdrv-ssc335/files/script/S95sigmastar +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t sigmastar "Check MAC for Sigmastar devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t sigmastar "The eth0 interface has a lousy MAC, let's try to change it.." - else - logger -s -p daemon.info -t sigmastar "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t sigmastar "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_sigmastar -i - # - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac \ No newline at end of file diff --git a/general/package/sigmastar-osdrv-ssc335/sigmastar-osdrv-ssc335.mk b/general/package/sigmastar-osdrv-ssc335/sigmastar-osdrv-ssc335.mk index a43f5519..ee9b0310 100644 --- a/general/package/sigmastar-osdrv-ssc335/sigmastar-osdrv-ssc335.mk +++ b/general/package/sigmastar-osdrv-ssc335/sigmastar-osdrv-ssc335.mk @@ -10,9 +10,6 @@ SIGMASTAR_OSDRV_SSC335_LICENSE = MIT SIGMASTAR_OSDRV_SSC335_LICENSE_FILES = LICENSE define SIGMASTAR_OSDRV_SSC335_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar-osdrv-ssc335/files/script/S95sigmastar - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/iqfile $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iqfile $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar-osdrv-ssc335/files/sensor/iqfile/filter.txt $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iqfile $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar-osdrv-ssc335/files/sensor/iqfile/imx307_iqfile.bin diff --git a/general/package/xiongmai-osdrv-xm510/files/script/S95xiongmai b/general/package/xiongmai-osdrv-xm510/files/script/S95xiongmai deleted file mode 100755 index 9223e85a..00000000 --- a/general/package/xiongmai-osdrv-xm510/files/script/S95xiongmai +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t xiongmai "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t xiongmai "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t xiongmai "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t xiongmai "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t xiongmai "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_xiongmai -i - # - SNS_TYPE=$(ipcinfo --short-sensor) - logger -s -p daemon.info -t xiongmai "You sensor is $SNS_TYPE" - # - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/general/package/xiongmai-osdrv-xm510/xiongmai-osdrv-xm510.mk b/general/package/xiongmai-osdrv-xm510/xiongmai-osdrv-xm510.mk index ecebd90d..3546e61f 100644 --- a/general/package/xiongmai-osdrv-xm510/xiongmai-osdrv-xm510.mk +++ b/general/package/xiongmai-osdrv-xm510/xiongmai-osdrv-xm510.mk @@ -10,9 +10,6 @@ XIONGMAI_OSDRV_XM510_LICENSE = MIT XIONGMAI_OSDRV_XM510_LICENSE_FILES = LICENSE define XIONGMAI_OSDRV_XM510_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-osdrv-xm510/files/script/S95xiongmai - # $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-osdrv-xm510/files/sensor/config/*.ini diff --git a/general/package/xiongmai-osdrv-xm530/files/script/S95xiongmai b/general/package/xiongmai-osdrv-xm530/files/script/S95xiongmai deleted file mode 100755 index ee0ec738..00000000 --- a/general/package/xiongmai-osdrv-xm530/files/script/S95xiongmai +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-s" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -load_majestic() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - [ -f /etc/coredump.conf ] && . /etc/coredump.conf - if [ "$coredump_enabled" ]; then - [ "$(yaml-cli -i /etc/majestic.yaml -g .watchdog.timeout)" -lt "30" ] && yaml-cli -i /etc/majestic.yaml -s .watchdog.timeout 30 - ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern - fi - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -# The daemon does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. -start() { - logger -s -p daemon.info -t xiongmai "Check MAC for Xiongmai devices" - if [ "$(fw_printenv -n ethaddr)" = "00:00:23:34:45:66" ]; then - logger -s -p daemon.info -t xiongmai "The eth0 interface has a lousy MAC, let's try to change it.." - XMMAC="$(ipcinfo --xm-mac)" && [ -n "${XMMAC}" ] && fw_setenv ethaddr ${XMMAC} && reboot -f || logger -s -p daemon.info -t xiongmai "It is not possible to install a new MAC on the eth0 interface.." - else - logger -s -p daemon.info -t xiongmai "The eth0 interface has a correct MAC - $(fw_printenv -n ethaddr)" - fi - # - logger -s -p daemon.info -t xiongmai "Loading of kernel modules and initialization of the video system has started" - export TZ=$(cat /etc/TZ) - load_xiongmai -i - # - if [ ! -f /usr/lib/libsns.so ]; then - SNS_TYPE=$(ipcinfo --short-sensor) - logger -s -p daemon.info -t xiongmai "You sensor is $SNS_TYPE and symlink to libsns.so not found" - case $SNS_TYPE in - - imx335|sc335e) - logger -s -p daemon.info -t xiongmai "Create new symlink to libsns_X50_XM530.so"; - ln -sf /usr/lib/sensors/libsns_X50_XM530.so /usr/lib/libsns.so; - ;; - - *) - logger -s -p daemon.info -t xiongmai "Create new symlink to libsns_X123_XM530.so"; - ln -sf /usr/lib/sensors/libsns_X123_XM530.so /usr/lib/libsns.so; - ;; - esac - fi - # - load_majestic -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, " - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - reload -} - -reload() { - load_majestic -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - diff --git a/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai b/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai index ef1868fd..9ce81686 100755 --- a/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai +++ b/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai @@ -108,6 +108,23 @@ remove_ko() remove_sns } +make_symlink() { +if [ ! -f /usr/lib/libsns.so ]; then + SNS_TYPE=$(ipcinfo --short-sensor) + logger -s -p daemon.info -t xiongmai "You sensor is $SNS_TYPE and symlink to libsns.so not found" + case $SNS_TYPE in + imx335|sc335e) + logger -s -p daemon.info -t xiongmai "Create new symlink to libsns_X50_XM530.so" + ln -sf /usr/lib/sensors/libsns_X50_XM530.so /usr/lib/libsns.so + ;; + *) + logger -s -p daemon.info -t xiongmai "Create new symlink to libsns_X123_XM530.so" + ln -sf /usr/lib/sensors/libsns_X123_XM530.so /usr/lib/libsns.so + ;; + esac +fi +} + load_usage() { echo "Usage: ./loadxm530 [-option]" @@ -123,6 +140,7 @@ if [ "$1" = "-i" ] then cd /lib/modules/3.10.103\+/xiongmai insert_ko +make_symlink fi if [ "$1" = "-r" ] @@ -141,4 +159,3 @@ then remove_ko insert_ko fi - diff --git a/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk b/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk index 72df1504..a8bdbc66 100644 --- a/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk +++ b/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk @@ -10,9 +10,6 @@ XIONGMAI_OSDRV_XM530_LICENSE = MIT XIONGMAI_OSDRV_XM530_LICENSE_FILES = LICENSE define XIONGMAI_OSDRV_XM530_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-osdrv-xm530/files/script/S95xiongmai - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-osdrv-xm530/files/sensor/config/*.ini