diff --git a/general/overlay/etc/inittab b/general/overlay/etc/inittab index dee44af8..ed2561f0 100644 --- a/general/overlay/etc/inittab +++ b/general/overlay/etc/inittab @@ -29,7 +29,7 @@ null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr ::sysinit:/etc/init.d/rcS # Put a getty on the serial port -console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL +console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL # Stuff to do for the 3-finger salute #::ctrlaltdel:/sbin/reboot diff --git a/general/overlay/usr/sbin/pqtools b/general/overlay/usr/sbin/pqtools index e9d98684..d0cec5ab 100755 --- a/general/overlay/usr/sbin/pqtools +++ b/general/overlay/usr/sbin/pqtools @@ -28,7 +28,7 @@ prepare() { *) echo -e "\n\e[1;31mSorry but the ${soc} is not supported at the moment...\e[0m\n" exit 1 - ;; + ;; esac } diff --git a/general/package/ambarella-osdrv-s3l/ambarella-osdrv-s3l.mk b/general/package/ambarella-osdrv-s3l/ambarella-osdrv-s3l.mk index 0af88de9..79e63f6c 100644 --- a/general/package/ambarella-osdrv-s3l/ambarella-osdrv-s3l.mk +++ b/general/package/ambarella-osdrv-s3l/ambarella-osdrv-s3l.mk @@ -14,7 +14,7 @@ define AMBARELLA_OSDRV_S3L_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(AMBARELLA_OSDRV_S3L_PKGDIR)/files/sensor/config/*.cfg - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.104/ambarella + $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.104/ambarella $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.104/ambarella $(AMBARELLA_OSDRV_S3L_PKGDIR)/files/kmod/*.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin diff --git a/general/package/baresip-openipc/baresip-openipc.mk b/general/package/baresip-openipc/baresip-openipc.mk index d6b5be7f..db934e89 100644 --- a/general/package/baresip-openipc/baresip-openipc.mk +++ b/general/package/baresip-openipc/baresip-openipc.mk @@ -70,5 +70,3 @@ endef $(eval $(generic-package)) $(eval $(host-generic-package)) - - diff --git a/general/package/ingenic-osdrv-t20/files/script/load_ingenic b/general/package/ingenic-osdrv-t20/files/script/load_ingenic index 079f246d..0282b36e 100755 --- a/general/package/ingenic-osdrv-t20/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t20/files/script/load_ingenic @@ -5,7 +5,7 @@ SOC=$(ipcinfo -f || fw_printenv -n soc) vendor=$(ipcinfo -v) if [ ! -f /usr/sbin/sensor_cli ]; then - ln -s /usr/sbin/extutils /usr/sbin/sensor_cli + ln -s /usr/sbin/extutils /usr/sbin/sensor_cli fi echo 1 >/proc/sys/vm/overcommit_memory @@ -15,63 +15,63 @@ log_vendor() { } check_return() { - if [ $? -ne 0 ]; then - echo err: $1 - echo exit - exit - fi + if [ $? -ne 0 ]; then + echo err: $1 + echo exit + exit + fi } lsmod | grep "sinfo" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sinfo.ko - check_return "insmod sinfo" + insmod ${KMOD_PATH/%\//}/sinfo.ko + check_return "insmod sinfo" fi if fw_printenv -n sensor >/dev/null; then - export SENSOR=$(fw_printenv -n sensor) - log_vendor "Get data from environment and set SENSOR as ${SENSOR}" + export SENSOR=$(fw_printenv -n 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#*:} - 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 + 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 "jxf22") - ISP_PARAM="isp_clk=90000000" - SENSOR_PARAM="" - ;; + ISP_PARAM="isp_clk=90000000" + SENSOR_PARAM="" + ;; "jxh42") - ISP_PARAM="isp_clk=90000000" - SENSOR_PARAM="" - ;; + ISP_PARAM="isp_clk=90000000" + SENSOR_PARAM="" + ;; "sc2135") - ISP_PARAM="isp_clk=100000000" - SENSOR_PARAM="" - ;; + ISP_PARAM="isp_clk=100000000" + SENSOR_PARAM="" + ;; "sc2232") - ISP_PARAM="isp_clk=90000000" - SENSOR_PARAM="" - ;; + ISP_PARAM="isp_clk=90000000" + SENSOR_PARAM="" + ;; "sc2235") - ISP_PARAM="isp_clk=90000000" - SENSOR_PARAM="" - ;; + ISP_PARAM="isp_clk=90000000" + SENSOR_PARAM="" + ;; *) - ISP_PARAM="isp_clk=90000000" - SENSOR_PARAM="" - break - ;; + ISP_PARAM="isp_clk=90000000" + SENSOR_PARAM="" + break + ;; esac echo -------------------- @@ -94,7 +94,7 @@ fi lsmod | grep "audio" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/audio2.ko - check_return "insmod audio" + insmod ${KMOD_PATH/%\//}/audio2.ko + check_return "insmod audio" fi diff --git a/general/package/ingenic-osdrv-t21/files/kmod/Readme.txt b/general/package/ingenic-osdrv-t21/files/kmod/Readme.txt index 761e72c5..ccd38d5c 100644 --- a/general/package/ingenic-osdrv-t21/files/kmod/Readme.txt +++ b/general/package/ingenic-osdrv-t21/files/kmod/Readme.txt @@ -1,29 +1,26 @@ - FILE MD5SUM SIZE GRAB SOC FIRMWARE sensor_jxf23_t21n.ko d7dadc963c26ce7ca465d361df48a94c 18264 @flyrouter T21N CamHi sensor_jxf23_t21z.ko fcdecb6440d83bb206df4b9cf52c2c48 17888 @john T21Z CamHi -sensor_jxf37_t21l.ko 0096780fc07334729e61b35580c3ddf8 17030 @metsys1 T21L cip37210v2 -sensor_jxf37_t21z.ko 3dc2e89d30e968bb85cf048e1d688251 16998 @themactep T21Z Shoppers +sensor_jxf37_t21l.ko 0096780fc07334729e61b35580c3ddf8 17030 @metsys1 T21L CIP-37210v2 +sensor_jxf37_t21z.ko 3dc2e89d30e968bb85cf048e1d688251 16998 @themactep T21Z Shopper+ sensor_os02b10_t21z.ko b1b8c6d95306789aeb459d5012b07846 14996 @bob-builder T21Z Wansview sensor_os02g10_t21z.ko 04f44457f7aeeba058ea676daf96bc8e 16223 @bob-builder T21Z Wansview sensor_ov2735b_t21z.ko 45a3b49b2ccc064493433cf136ed59a5 16448 @bob-builder T21Z Wansview sensor_sc1245a_t21n.ko 398dd5eb2ef697fa7f50e648d2d16788 16676 @flyrouter T21N Jabsco -sensor_sc1345_t21z.ko f4bae56550a385dcbbb11d327f59777a 15864 @themactep T21Z Shoppers +sensor_sc1345_t21z.ko f4bae56550a385dcbbb11d327f59777a 15864 @themactep T21Z Shopper+ sensor_sc2230_t21n.ko 44e51b2eac0f93c1adcad906c69059fc 15760 @flyrouter T21N Jabsco sensor_sc2232_t21n.ko a739485a158a247df079e221ec973ab5 18028 @flyrouter T21N Jabsco sensor_sc2232h_t21n.ko b1ad55e6f9f4cdc696f70855a3cbcef8 18237 @flyrouter T21N CamHi sensor_sc2232h_t21z.ko 14413a6b9a5675f73a2137dba927405c 18253 @john T21Z CamHi -sensor_sc2300_t21z.ko a66a2ef0444ea67f39a2914ec7a8bbbf 17447 @themactep T21Z Shoppers -sensor_sc2332_t21z.ko f5cd31d4c1555660fd1ea6014b06429e 15071 @themactep T21Z Shoppers +sensor_sc2300_t21z.ko a66a2ef0444ea67f39a2914ec7a8bbbf 17447 @themactep T21Z Shopper+ +sensor_sc2332_t21z.ko f5cd31d4c1555660fd1ea6014b06429e 15071 @themactep T21Z Shopper+ sensor_sc2335_t21n.ko 9318b3db2f7d79c7c014c04e64a26381 16967 @flyrouter T21N CamHi sensor_sc2335_t21z.ko 22fc60e4ac52491f9b5df2af244e21bc 17726 @john T31Z CamHi -tx-isp-t21l.ko 8e0fe41ff138aee4d011edbf1994e246 732733 @metsys1 T21L cip37210v2 +tx-isp-t21l.ko 8e0fe41ff138aee4d011edbf1994e246 732733 @metsys1 T21L CIP-37210v2 tx-isp-t21n.ko f8c577640b9cc31a4a846cb174210755 706092 @flyrouter T21N Jabsco tx-isp-t21n-2.ko 8e0fe41ff138aee4d011edbf1994e246 732733 @flyrouter T21N CamHi tx-isp-t21z.ko 8e73245902dc2230fce3593b5a701f27 734529 @john T21Z CamHi tx-isp-t21z-2.ko dde2bb198728cb9e3860d2d740a41cd8 734177 @bob-builder T21Z Wansview tx-isp-t21z-3.ko f5c56de7cde15721cb8c72a2cb9e796f 732701 @themactep T21Z Shoppers - - diff --git a/general/package/ingenic-osdrv-t21/files/script/ircut_demo b/general/package/ingenic-osdrv-t21/files/script/ircut_demo index fe257338..01565287 100755 --- a/general/package/ingenic-osdrv-t21/files/script/ircut_demo +++ b/general/package/ingenic-osdrv-t21/files/script/ircut_demo @@ -1,11 +1,5 @@ -if [ ! -d "/sys/class/gpio/gpio49" ] -then -echo 49 > /sys/class/gpio/export -fi -if [ ! -d "/sys/class/gpio/gpio50" ] -then -echo 50 > /sys/class/gpio/export -fi +[ ! -d "/sys/class/gpio/gpio49" ] && echo 49 > /sys/class/gpio/export +[ ! -d "/sys/class/gpio/gpio50" ] && echo 50 > /sys/class/gpio/export echo out > /sys/class/gpio/gpio49/direction echo out > /sys/class/gpio/gpio50/direction @@ -13,7 +7,6 @@ echo out > /sys/class/gpio/gpio50/direction echo 0 > /sys/class/gpio/gpio49/active_low echo 0 > /sys/class/gpio/gpio50/active_low - echo 0 > /sys/class/gpio/gpio49/value usleep 10000 @@ -21,7 +14,7 @@ usleep 10000 echo $1 > /sys/class/gpio/gpio49/value echo $2 > /sys/class/gpio/gpio50/value - usleep 10000 + echo 0 > /sys/class/gpio/gpio49/value echo 0 > /sys/class/gpio/gpio50/value diff --git a/general/package/ingenic-osdrv-t21/files/script/load_ingenic b/general/package/ingenic-osdrv-t21/files/script/load_ingenic index d5591162..75bb49dc 100755 --- a/general/package/ingenic-osdrv-t21/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t21/files/script/load_ingenic @@ -5,85 +5,85 @@ SOC=$(ipcinfo -f || fw_printenv -n soc) vendor=$(ipcinfo -v) if [ ! -f /usr/sbin/sensor_cli ]; then - ln -s /usr/sbin/extutils /usr/sbin/sensor_cli + 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" + logger -s -p daemon.info -t ${vendor} "$1" } check_return() { - if [ $? -ne 0 ]; then - echo err: $1 - echo exit - exit - fi + if [ $? -ne 0 ]; then + echo err: $1 + echo exit + exit + fi } lsmod | grep "sinfo" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sinfo.ko - check_return "insmod sinfo" + insmod ${KMOD_PATH/%\//}/sinfo.ko + check_return "insmod sinfo" fi if fw_printenv -n sensor >/dev/null; then - export SENSOR=$(fw_printenv -n sensor) - log_vendor "Get data from environment and set SENSOR as ${SENSOR}" + export SENSOR=$(fw_printenv -n 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#*:} - 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 + 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 "gc2053") - ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="sensor_max_fps=25 data_interface=1" - ;; + ISP_PARAM="isp_clk=125000000" + SENSOR_PARAM="sensor_max_fps=25 data_interface=1" + ;; "jxf23") - ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="sensor_gpio_func=0" - ;; + ISP_PARAM="isp_clk=125000000" + SENSOR_PARAM="sensor_gpio_func=0" + ;; "jxf37") - ISP_PARAM="isp_clk=90000000" - SENSOR_PARAM="sensor_gpio_func=0" - ;; + ISP_PARAM="isp_clk=90000000" + SENSOR_PARAM="sensor_gpio_func=0" + ;; "ov2735b") - ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="sensor_gpio_func=0" - ;; + ISP_PARAM="isp_clk=125000000" + SENSOR_PARAM="sensor_gpio_func=0" + ;; "sc2232") - ISP_PARAM="isp_clk=90000000" - SENSOR_PARAM="" - ;; + ISP_PARAM="isp_clk=90000000" + SENSOR_PARAM="" + ;; "sc2232h") - ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="sensor_gpio_func=0" - ;; + ISP_PARAM="isp_clk=125000000" + SENSOR_PARAM="sensor_gpio_func=0" + ;; "sc2332") - ISP_PARAM="" - SENSOR_PARAM="sensor_gpio_func=0" - ;; + ISP_PARAM="" + SENSOR_PARAM="sensor_gpio_func=0" + ;; "sc2335") - ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="sensor_gpio_func=0" - ;; + ISP_PARAM="isp_clk=125000000" + SENSOR_PARAM="sensor_gpio_func=0" + ;; *) - ISP_PARAM="isp_clk=90000000" - SENSOR_PARAM="sensor_gpio_func=0" - break - ;; + ISP_PARAM="isp_clk=90000000" + SENSOR_PARAM="sensor_gpio_func=0" + break + ;; esac echo -------------------- @@ -94,18 +94,18 @@ echo -------------------- lsmod | grep "tx_isp" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/tx-isp-${SOC}.ko ${ISP_PARAM} - check_return "insmod isp drv" + insmod ${KMOD_PATH/%\//}/tx-isp-${SOC}.ko ${ISP_PARAM} + check_return "insmod isp drv" fi lsmod | grep ${SENSOR} >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_${SOC}.ko ${SENSOR_PARAM} - check_return "insmod sensor drv" + 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" + insmod ${KMOD_PATH/%\//}/audio.ko + check_return "insmod audio" fi diff --git a/general/package/ingenic-osdrv-t21/files/sensor/params/Readme.txt b/general/package/ingenic-osdrv-t21/files/sensor/params/Readme.txt index cc994a93..a01dae9f 100644 --- a/general/package/ingenic-osdrv-t21/files/sensor/params/Readme.txt +++ b/general/package/ingenic-osdrv-t21/files/sensor/params/Readme.txt @@ -1,10 +1,9 @@ - FILE MD5SUM SIZE GRAB SOC FIRMWARE jxf23-t21.bin d5a7b0353bfa8eb9534d5c55616294da 121496 @flyrouter T21N CamHi jxf23-t21.bin d5a7b0353bfa8eb9534d5c55616294da 121496 @john T21Z CamHi -jxf37-t21.bin 5c29e8b8e787cdd0651dfbd29eba73dc 121496 @metsys1 T21L cip37210v2 -jxf37-t21.bin 5c29e8b8e787cdd0651dfbd29eba73dc 121496 @themactep T21Z Shoppers +jxf37-t21.bin 5c29e8b8e787cdd0651dfbd29eba73dc 121496 @metsys1 T21L CIP-37210v2 +jxf37-t21.bin 5c29e8b8e787cdd0651dfbd29eba73dc 121496 @themactep T21Z Shopper+ os02b10-t21.bin 1f235dd55e9b8f7090ecf92af9d7d6cc 121496 @bob-builder T21Z Wansview os02g10-t21.bin bce272b3ebea24bc06eaba34bea042d4 121496 @bob-builder T21Z Wansview ov2735b-t21.bin 281b998627c0c9a28874756f6870b29b 121496 @bob-builder T21Z Wansview @@ -14,11 +13,8 @@ sc2230-t21.bin 5df9bc15d445a6f31ca146c8f272cdda 121496 @flyrout sc2232-t21.bin e42492f8d7184a8b0601fb1a437db9f0 121496 @flyrouter T21N Jabsco sc2232h-t21.bin 455117e1a0dc83d36a964c798f8eb006 121496 @flyrouter T21N CamHi sc2232h-t21.bin 455117e1a0dc83d36a964c798f8eb006 121496 @john T21Z CamHi -sc2300-300w-t21.bin 83c2b3d50f8be41086b02887b1471f6a 121496 @themactep T21Z Shoppers -sc2300-t21.bin 83c2b3d50f8be41086b02887b1471f6a 121496 @themactep T21Z Shoppers -sc2332-t21.bin 95ffdfb79328c01760096d8eb9f59b09 121496 @themactep T21Z Shoppers +sc2300-300w-t21.bin 83c2b3d50f8be41086b02887b1471f6a 121496 @themactep T21Z Shopper+ +sc2300-t21.bin 83c2b3d50f8be41086b02887b1471f6a 121496 @themactep T21Z Shopper+ +sc2332-t21.bin 95ffdfb79328c01760096d8eb9f59b09 121496 @themactep T21Z Shopper+ sc2335-t21.bin 8740c28b83d78712da9c7f11b5ee070a 121496 @flyrouter T21N CamHi sc2335-t21-2.bin 2e99afac30c1d67b73550ffb72d65b91 121496 @john T21Z CamHi - - - diff --git a/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk b/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk index 40acbae4..75304e55 100644 --- a/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk +++ b/general/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk @@ -58,7 +58,7 @@ define INGENIC_OSDRV_T21_INSTALL_TARGET_CMDS # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors/params/WDR $(INGENIC_OSDRV_T21_PKGDIR)/files/sensor/params/WDR/*.bin $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib - $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(INGENIC_OSDRV_T21_PKGDIR)/files/lib/*.so + $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(INGENIC_OSDRV_T21_PKGDIR)/files/lib/*.so endef $(eval $(generic-package)) diff --git a/general/package/ingenic-osdrv-t30/files/script/load_ingenic b/general/package/ingenic-osdrv-t30/files/script/load_ingenic index 77db487d..33c31c10 100755 --- a/general/package/ingenic-osdrv-t30/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t30/files/script/load_ingenic @@ -5,54 +5,54 @@ SOC=$(ipcinfo -f || fw_printenv -n soc) vendor=$(ipcinfo -v) if [ ! -f /usr/sbin/sensor_cli ]; then - ln -s /usr/sbin/extutils /usr/sbin/sensor_cli + 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" + logger -s -p daemon.info -t ${vendor} "$1" } check_return() { - if [ $? -ne 0 ]; then - echo err: $1 - echo exit - exit - fi + if [ $? -ne 0 ]; then + echo err: $1 + echo exit + exit + fi } lsmod | grep "sinfo" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sinfo.ko - check_return "insmod sinfo" + insmod ${KMOD_PATH/%\//}/sinfo.ko + check_return "insmod sinfo" fi if fw_printenv -n sensor >/dev/null; then - export SENSOR=$(fw_printenv -n sensor) - log_vendor "Get data from environment and set SENSOR as ${SENSOR}" + export SENSOR=$(fw_printenv -n 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#*:} - 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 + 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 *) - ISP_PARAM="" - SENSOR_PARAM="" - break - ;; + ISP_PARAM="" + SENSOR_PARAM="" + break + ;; esac echo -------------------- @@ -63,26 +63,26 @@ echo -------------------- lsmod | grep "tx_isp" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/tx-isp-${SOC}.ko ${ISP_PARAM} - check_return "insmod isp drv" + insmod ${KMOD_PATH/%\//}/tx-isp-${SOC}.ko ${ISP_PARAM} + check_return "insmod isp drv" fi lsmod | grep ${SENSOR} >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_${SOC}.ko ${SENSOR_PARAM} - check_return "insmod sensor drv" + 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" + insmod ${KMOD_PATH/%\//}/audio.ko + check_return "insmod audio" fi lsmod | grep "gpio" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/gpio.ko - check_return "insmod gpio" + insmod ${KMOD_PATH/%\//}/gpio.ko + check_return "insmod gpio" fi if [ ! -z "$(lsmod | grep "gpio")" ]; then diff --git a/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk b/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk index 059f74a0..a20c1859 100644 --- a/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk +++ b/general/package/ingenic-osdrv-t30/ingenic-osdrv-t30.mk @@ -12,6 +12,7 @@ INGENIC_OSDRV_T30_LICENSE_FILES = LICENSE define INGENIC_OSDRV_T30_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensor $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/*.yaml + # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/bg0806.bin # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/gc2023.bin # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/gc2033.bin @@ -23,7 +24,6 @@ define INGENIC_OSDRV_T30_INSTALL_TARGET_CMDS # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/jxf22.bin # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/jxf23.bin # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/jxh62.bin - # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_bg0806.bin # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_gc2023.bin # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_gc2033.bin @@ -51,7 +51,6 @@ define INGENIC_OSDRV_T30_INSTALL_TARGET_CMDS # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_sc2235.bin # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_sc4236.bin # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ncu_sc5235.bin - # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/os02b10.bin # $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/os05a10.bin $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T30_PKGDIR)/files/sensor/params/ov2735b.bin diff --git a/general/package/ingenic-osdrv-t31/files/script/load_ingenic b/general/package/ingenic-osdrv-t31/files/script/load_ingenic index 67d0c074..bf6ca3b5 100755 --- a/general/package/ingenic-osdrv-t31/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t31/files/script/load_ingenic @@ -11,24 +11,24 @@ fi echo 1 >/proc/sys/vm/overcommit_memory log_vendor() { - logger -s -p daemon.info -t ${vendor} "$1" + logger -s -p daemon.info -t ${vendor} "$1" } check_vb() { - if [ "$(fw_printenv -n totalmem)" = "64M" ] && [ "$(fw_printenv -n rmem)" = "40M" ]; then - log_vendor "Setting osmem, rmem & blkcnt..." - fw_setenv osmem 39M && fw_setenv rmem 25M@0x2700000 && cli -s .isp.blkCnt 1 && reboot - fi + if [ "$(fw_printenv -n totalmem)" = "64M" ] && [ "$(fw_printenv -n rmem)" = "40M" ]; then + log_vendor "Setting osmem, rmem & blkcnt..." + fw_setenv osmem 39M && fw_setenv rmem 25M@0x2700000 && cli -s .isp.blkCnt 1 && reboot + fi } check_vb check_return() { - if [ $? -ne 0 ]; then - echo err: $1 - echo exit - exit - fi + if [ $? -ne 0 ]; then + echo err: $1 + echo exit + exit + fi } SENSOR_EXT_PARAM="" @@ -43,114 +43,114 @@ sync_sensor_param() { 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 + 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" + insmod ${KMOD_PATH/%\//}/sinfo.ko + check_return "insmod sinfo" fi if fw_printenv -n sensor >/dev/null; then - export SENSOR=$(fw_printenv -n sensor) - log_vendor "Get data from environment and set SENSOR as ${SENSOR}" + export SENSOR=$(fw_printenv -n 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#*:} - 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 + 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 sync_sensor_param case ${SENSOR} in "gc2053") - AVPU_PARAM="clk_name=vpll avpu_clk=400000000" - ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="data_interface=1" - ;; + AVPU_PARAM="clk_name=vpll avpu_clk=400000000" + ISP_PARAM="isp_clk=125000000" + SENSOR_PARAM="data_interface=1" + ;; "gc2083") - AVPU_PARAM="clk_name=vpll avpu_clk=400000000" - ISP_PARAM="isp_clk=200000000" - SENSOR_PARAM="shvflip=1" - ;; + 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="" - ;; + 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="" - ;; + 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" - ;; + 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="" - ;; + 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="" - ;; + 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" - ;; + 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="" - ;; + 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="" - ;; + 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="" - ;; + 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="" - ;; + ISP_PARAM="isp_clk=150000000" + SENSOR_PARAM="" + ;; "sc5235") AVPU_PARAM="clk_name=vpll avpu_clk=400000000" - ISP_PARAM="isp_clk=200000000" - SENSOR_PARAM="" - ;; + ISP_PARAM="isp_clk=200000000" + SENSOR_PARAM="" + ;; *) AVPU_PARAM="clk_name=vpll avpu_clk=400000000" - ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="" - break - ;; + ISP_PARAM="isp_clk=125000000" + SENSOR_PARAM="" + break + ;; esac echo -------------------- @@ -162,39 +162,39 @@ echo -------------------- lsmod | grep "avpu" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/avpu.ko ${AVPU_PARAM} - check_return "insmod avpu" + 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-${SOC}.ko ${ISP_PARAM} - check_return "insmod isp drv" + insmod ${KMOD_PATH/%\//}/tx-isp-${SOC}.ko ${ISP_PARAM} + check_return "insmod isp drv" fi lsmod | grep ${SENSOR} >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_${SOC}.ko ${SENSOR_PARAM} ${SENSOR_EXT_PARAM} - check_return "insmod sensor drv" + insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_${SOC}.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" + insmod ${KMOD_PATH/%\//}/audio.ko + check_return "insmod audio" fi lsmod | grep "gpio" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/gpio.ko - check_return "insmod gpio" + insmod ${KMOD_PATH/%\//}/gpio.ko + check_return "insmod gpio" fi if [ ! -z "$(lsmod | grep "gpio")" ]; then GPIOS=".nightMode.irCutPin1 .nightMode.irCutPin2 .nightMode.irSensorPin .nightMode.backlightPin .audio.speakerPin" for GPIO in $(echo ${GPIOS}) do - G=$(cli -g ${GPIO}) - [ ! -z "${G}" ] && echo ${G} > /proc/jz/claim/gpio + G=$(cli -g ${GPIO}) + [ ! -z "${G}" ] && echo ${G} > /proc/jz/claim/gpio done fi diff --git a/general/package/ingenic-osdrv-t40/files/script/load_ingenic b/general/package/ingenic-osdrv-t40/files/script/load_ingenic index 72bbb5ce..677083b4 100755 --- a/general/package/ingenic-osdrv-t40/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t40/files/script/load_ingenic @@ -11,63 +11,63 @@ fi echo 1 >/proc/sys/vm/overcommit_memory log_vendor() { - logger -s -p daemon.info -t ${vendor} "$1" + logger -s -p daemon.info -t ${vendor} "$1" } check_return() { - if [ $? -ne 0 ]; then - echo err: $1 - echo exit - exit - fi + if [ $? -ne 0 ]; then + echo err: $1 + echo exit + exit + fi } lsmod | grep "sinfo" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sinfo.ko - check_return "insmod sinfo" + insmod ${KMOD_PATH/%\//}/sinfo.ko + check_return "insmod sinfo" fi if fw_printenv -n sensor >/dev/null; then - export SENSOR=$(fw_printenv -n sensor) - log_vendor "Get data from environment and set SENSOR as ${SENSOR}" + export SENSOR=$(fw_printenv -n 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#*:} - 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 + 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 "imx307") - AVPU_PARAM="clk_name=mpll avpu_clk=550000000" - ISP_PARAM="clk_name=mpll isp_clk=367000000 isp_memopt=2" - SENSOR_PARAM="" - ;; + AVPU_PARAM="clk_name=mpll avpu_clk=550000000" + ISP_PARAM="clk_name=mpll isp_clk=367000000 isp_memopt=2" + SENSOR_PARAM="" + ;; "imx335") - AVPU_PARAM="clk_name=vpll avpu_clk=654000000" - ISP_PARAM="clk_name=mpll isp_clk=367000000 isp_memopt=2" - SENSOR_PARAM="" - ;; + AVPU_PARAM="clk_name=vpll avpu_clk=654000000" + ISP_PARAM="clk_name=mpll isp_clk=367000000 isp_memopt=2" + SENSOR_PARAM="" + ;; "imx415") - AVPU_PARAM="clk_name=vpll avpu_clk=654000000" - ISP_PARAM="isp_clk=350000000" - SENSOR_PARAM="" - ;; + AVPU_PARAM="clk_name=vpll avpu_clk=654000000" + ISP_PARAM="isp_clk=350000000" + SENSOR_PARAM="" + ;; *) - AVPU_PARAM="clk_name=vpll avpu_clk=654000000" - ISP_PARAM="isp_clk=350000000" - SENSOR_PARAM="" - break - ;; + AVPU_PARAM="clk_name=vpll avpu_clk=654000000" + ISP_PARAM="isp_clk=350000000" + SENSOR_PARAM="" + break + ;; esac echo -------------------- @@ -79,39 +79,39 @@ echo -------------------- lsmod | grep "avpu" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/avpu.ko ${AVPU_PARAM} - check_return "insmod avpu" + 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-${SOC}.ko ${ISP_PARAM} - check_return "insmod isp drv" + insmod ${KMOD_PATH/%\//}/tx-isp-${SOC}.ko ${ISP_PARAM} + check_return "insmod isp drv" fi lsmod | grep ${SENSOR} >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/sensor_${SENSOR}_${SOC}.ko ${SENSOR_PARAM} - check_return "insmod sensor drv" + 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" + insmod ${KMOD_PATH/%\//}/audio.ko + check_return "insmod audio" fi lsmod | grep "gpio" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/gpio.ko - check_return "insmod gpio" + insmod ${KMOD_PATH/%\//}/gpio.ko + check_return "insmod gpio" fi if [ ! -z "$(lsmod | grep "gpio")" ]; then GPIOS=".nightMode.irCutPin1 .nightMode.irCutPin2 .nightMode.irSensorPin .nightMode.backlightPin .audio.speakerPin" for GPIO in $(echo ${GPIOS}) do - G=$(cli -g ${GPIO}) - [ ! -z "${G}" ] && echo ${G} > /proc/jz/claim/gpio + G=$(cli -g ${GPIO}) + [ ! -z "${G}" ] && echo ${G} > /proc/jz/claim/gpio done fi diff --git a/general/package/librem-openipc/Config.in b/general/package/librem-openipc/Config.in index 86df6664..18b95c5a 100644 --- a/general/package/librem-openipc/Config.in +++ b/general/package/librem-openipc/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_LIBREM_OPENIPC bool "librem-openipc" select BR2_PACKAGE_LIBRE_OPENIPC help - librem is a Audio and video processing media library. + librem is an audio and video processing media library. https://github.com/baresip/rem diff --git a/general/package/microbe-web/files/S50httpd b/general/package/microbe-web/files/S50httpd index 183e3883..3283e8cd 100755 --- a/general/package/microbe-web/files/S50httpd +++ b/general/package/microbe-web/files/S50httpd @@ -10,11 +10,11 @@ HTTPD_ARGS="httpd -p 85 -f -c $CONFFILE -r Authentication" [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" if [ "$(fw_printenv -n debug)" ]; then - echo "Development mode. Disabling Basic Auth" - sed -i "/^\/cgi-bin:admin:/s/^/#/" $CONFFILE + echo "Development mode" + sed -i "/^\/cgi-bin:admin:/s/^/#/" $CONFFILE else - echo "Production mode. Enabling Basic Auth" - sed -i "/^#\/cgi-bin:admin:/s/^#//" $CONFFILE + echo "Production mode" + sed -i "/^#\/cgi-bin:admin:/s/^#//" $CONFFILE fi # The httpd does not create a pidfile, so pass "-n" in the command line diff --git a/general/package/motors/motors.mk b/general/package/motors/motors.mk index abb82481..680f7b76 100644 --- a/general/package/motors/motors.mk +++ b/general/package/motors/motors.mk @@ -1,6 +1,6 @@ ################################################################################ # -# motors | updated 2022.05.11 +# motors | updated 2023.05.11 # ################################################################################ diff --git a/general/package/nabto/readme.md b/general/package/nabto/readme.md index 92dcd458..b11b4c6a 100644 --- a/general/package/nabto/readme.md +++ b/general/package/nabto/readme.md @@ -54,7 +54,7 @@ tcp_tunnel_device Make sure that the connection was successful (example): ``` -root@openipc-t31:# tcp_tunnel_device +root@openipc-t31:# tcp_tunnel_device ######## Nabto TCP Tunnel Device ######## # Product ID: pr-ydk3xhyn @@ -63,14 +63,14 @@ root@openipc-t31:# tcp_tunnel_device # Version: 0.0.0-branch.heads/master.commits.1910+a49d27fc.dirty # Local UDP Port: 5592 # Friendly Name: "Tcp Tunnel" -# +# # The device offers Local Open Pairing -# +# # The device has Password Open Pairing enabled # Open Pairing Password: X9NphkArpzLU # Open Pairing SCT: 9jLgbUb4FWhe # Open Pairing String: p=pr-ydk3xhyn,d=de-orruyc4n,pwd=X9NphkArpzLU,sct=9jLgbUb4FWhe -# +# ######## Configured TCP Services ######## # Id Type Host Port # rtsp rtsp 127.0.0.1 554 diff --git a/general/package/quirc-openipc/Config.in b/general/package/quirc-openipc/Config.in index a6ef154e..bfc36f68 100644 --- a/general/package/quirc-openipc/Config.in +++ b/general/package/quirc-openipc/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_QUIRC_OPENIPC bool "quirc" - select BR2_PACKAGE_LIBJPEG + select BR2_PACKAGE_LIBJPEG help QR codes are a type of high-density matrix barcodes, and quirc is a library for extracting and decoding them from images.