From efb0f386831c823100bb1e7b0f3248d8885b8571 Mon Sep 17 00:00:00 2001 From: "Signor Pellegrino (from Citadel PC)" Date: Sat, 20 Jul 2024 12:34:36 +0300 Subject: [PATCH] Remove unused and integrated --- packages/baresip-openipc/0002-new | 12 -- .../baresip-openipc/0002-webrtc-fix.patch | 12 -- packages/baresip-openipc/0003-new | 11 -- packages/baresip-openipc/0003-test.patch | 11 -- .../0004-h264passcodec-enable.patch | 10 -- packages/baresip-openipc/0005-aec-fix.patch | 13 -- packages/baresip-openipc/files/S97baresip | 47 ------- .../general/overlay/usr/bin/baresip2 | 3 - .../general/overlay/etc/composer.ini | 7 +- .../general/scripts/excludes/t31_lite.list | 133 +++++++++--------- 10 files changed, 71 insertions(+), 188 deletions(-) delete mode 100644 packages/baresip-openipc/0002-new delete mode 100644 packages/baresip-openipc/0002-webrtc-fix.patch delete mode 100644 packages/baresip-openipc/0003-new delete mode 100644 packages/baresip-openipc/0003-test.patch delete mode 100644 packages/baresip-openipc/0004-h264passcodec-enable.patch delete mode 100644 packages/baresip-openipc/0005-aec-fix.patch delete mode 100755 packages/baresip-openipc/files/S97baresip delete mode 100755 projects/gk7205v200_ultimate_baresip/general/overlay/usr/bin/baresip2 diff --git a/packages/baresip-openipc/0002-new b/packages/baresip-openipc/0002-new deleted file mode 100644 index 43588d5..0000000 --- a/packages/baresip-openipc/0002-new +++ /dev/null @@ -1,12 +0,0 @@ ---- a/mk/modules.mk 2022-03-27 11:22:42.000000000 +0300 -+++ b/mk/modules.mk 2023-05-17 15:08:22.900324363 +0300 -@@ -127,8 +127,7 @@ - USE_OMX_RPI := $(shell $(call CC_TEST,bcm_host.h)) - - USE_OMX_BELLAGIO := $(shell $(call CC_TEST,OMX_Core.h)) --USE_WEBRTC_AEC := $(shell \ -- pkg-config --exists "webrtc-audio-processing >= 0.3" && echo "yes") -+USE_WEBRTC_AEC := 1 - else - # Windows. - # Accounts for mingw with Windows SDK (formerly known as Platform SDK) diff --git a/packages/baresip-openipc/0002-webrtc-fix.patch b/packages/baresip-openipc/0002-webrtc-fix.patch deleted file mode 100644 index 4d7dd9c..0000000 --- a/packages/baresip-openipc/0002-webrtc-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/mk/modules.mk 2022-03-27 11:22:42.000000000 +0300 -+++ b/mk/modules.mk 2023-05-17 15:08:22.900324363 +0300 -@@ -127,8 +127,7 @@ - USE_OMX_RPI := $(shell $(call CC_TEST,bcm_host.h)) - - USE_OMX_BELLAGIO := $(shell $(call CC_TEST,OMX_Core.h)) --USE_WEBRTC_AEC := $(shell \ -- pkg-config --exists "webrtc-audio-processing >= 0.3" && echo "yes") -+USE_WEBRTC_AEC := $(shell $(call CC_TEST,webrtc_audio_processing/webrtc/base/checks.h)) - else - # Windows. - # Accounts for mingw with Windows SDK (formerly known as Platform SDK) diff --git a/packages/baresip-openipc/0003-new b/packages/baresip-openipc/0003-new deleted file mode 100644 index 81960e0..0000000 --- a/packages/baresip-openipc/0003-new +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/webrtc_aec/module.mk 2022-03-27 11:22:42.000000000 +0300 -+++ b/modules/webrtc_aec/module.mk 2023-05-17 15:25:09.887363976 +0300 -@@ -5,7 +5,7 @@ - # - - --WEBRTC_PATH := /usr/include/webrtc_audio_processing -+WEBRTC_PATH := ../../../staging/usr/include - - MOD := webrtc_aec - diff --git a/packages/baresip-openipc/0003-test.patch b/packages/baresip-openipc/0003-test.patch deleted file mode 100644 index 89a5446..0000000 --- a/packages/baresip-openipc/0003-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/webrtc_aec/module.mk 2022-03-27 11:22:42.000000000 +0300 -+++ b/modules/webrtc_aec/module.mk 2023-05-17 15:25:09.887363976 +0300 -@@ -5,7 +5,7 @@ - # - - --WEBRTC_PATH := /usr/include/webrtc_audio_processing -+WEBRTC_PATH ?= ../webrtc_audio_processing - - MOD := webrtc_aec - diff --git a/packages/baresip-openipc/0004-h264passcodec-enable.patch b/packages/baresip-openipc/0004-h264passcodec-enable.patch deleted file mode 100644 index f8618af..0000000 --- a/packages/baresip-openipc/0004-h264passcodec-enable.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/mk/modules.mk 2023-05-17 15:27:29.246699261 +0300 -+++ b/mk/modules.mk 2023-05-17 17:38:38.815152975 +0300 -@@ -182,6 +182,7 @@ - MODULES += ebuacip - MODULES += echo - MODULES += fakevideo -+MODULES += h264passcodec - MODULES += httpd - MODULES += ice - MODULES += menu diff --git a/packages/baresip-openipc/0005-aec-fix.patch b/packages/baresip-openipc/0005-aec-fix.patch deleted file mode 100644 index c32413d..0000000 --- a/packages/baresip-openipc/0005-aec-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/modules/webrtc_aec/aec.h 2022-03-27 11:22:42.000000000 +0300 -+++ b/modules/webrtc_aec/aec.h 2023-06-19 18:32:36.459229801 +0300 -@@ -7,8 +7,8 @@ - #include - - #define WEBRTC_POSIX 1 --#include --#include -+#include -+#include - - - #define MAX_CHANNELS 1 diff --git a/packages/baresip-openipc/files/S97baresip b/packages/baresip-openipc/files/S97baresip deleted file mode 100755 index 6cef742..0000000 --- a/packages/baresip-openipc/files/S97baresip +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -DAEMON="baresip" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-f /etc/baresip" - -start() { - printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - 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 - start -} - -case "$1" in - start|stop|restart) - "$1";; - reload) - restart;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/projects/gk7205v200_ultimate_baresip/general/overlay/usr/bin/baresip2 b/projects/gk7205v200_ultimate_baresip/general/overlay/usr/bin/baresip2 deleted file mode 100755 index a8d1ea9..0000000 --- a/projects/gk7205v200_ultimate_baresip/general/overlay/usr/bin/baresip2 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo BARESIP diff --git a/projects/ssc337de_ultimate_broadband/general/overlay/etc/composer.ini b/projects/ssc337de_ultimate_broadband/general/overlay/etc/composer.ini index 66d5eeb..f7ce166 100644 --- a/projects/ssc337de_ultimate_broadband/general/overlay/etc/composer.ini +++ b/projects/ssc337de_ultimate_broadband/general/overlay/etc/composer.ini @@ -1,6 +1,7 @@ # -composer_message="This firmware was created with the Composer project." +composer_message="This firmware was created with the OpenIPC Composer project." # -default_timezone="MSK-3,Europe/Moscow" +default_timezone="MSK-3 | Europe/Moscow" # -Фаил firmware WiFi + + diff --git a/projects/t31_lite_convoy/general/scripts/excludes/t31_lite.list b/projects/t31_lite_convoy/general/scripts/excludes/t31_lite.list index 89ec1cc..771330b 100644 --- a/projects/t31_lite_convoy/general/scripts/excludes/t31_lite.list +++ b/projects/t31_lite_convoy/general/scripts/excludes/t31_lite.list @@ -1,66 +1,67 @@ -etc/sensor/gc2083-t31.bin -etc/sensor/gc2083.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc2083_t31.ko -etc/sensor/gc4023-t31.bin -etc/sensor/gc4023.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc4023_t31.ko -etc/sensor/gc4653-t31.bin -etc/sensor/gc4653.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc4653_t31.ko -etc/sensor/imx327-t31.bin -etc/sensor/imx327.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_imx327_t31.ko -etc/sensor/jxf37-t31.bin -etc/sensor/jxf37.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxf37_t31.ko -etc/sensor/jxh62-t31.bin -etc/sensor/jxh62.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxh62_t31.ko -etc/sensor/jxh63.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxh63_t31.ko -etc/sensor/jxq03p-t31.bin -etc/sensor/jxq03p.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03p_t31.ko -etc/sensor/jxq03-t31.bin -etc/sensor/jxq03.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03_t31.ko -etc/sensor/sc200ai-t31.bin -etc/sensor/sc200ai.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc200ai_t31.ko -etc/sensor/sc2232h-t31.bin -etc/sensor/sc2232h.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc2232h_t31.ko -etc/sensor/sc2335-t31.bin -etc/sensor/sc2335.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc2335_t31.ko -etc/sensor/sc2336-t31.bin -etc/sensor/sc2336.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc2336_t31.ko -etc/sensor/sc3335-t31.bin -etc/sensor/sc3335.yaml -etc/sensor/sc3338-t31.bin -etc/sensor/sc3338.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc3338_t31.ko -etc/sensor/sc4236-t31.bin -etc/sensor/sc4236.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc4236_t31.ko -etc/sensor/sc5235-t31.bin -etc/sensor/sc5235.yaml -lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc5235_t31.ko -etc/sensor/jxf22.yaml -etc/sensor/jxf23.yaml -etc/sensor/jxh42.yaml -etc/sensor/jxk04.yaml -etc/sensor/os03b10.yaml -etc/sensor/ov2735b.yaml -etc/sensor/ov2735.yaml -etc/sensor/ov4689.yaml -etc/sensor/ps5260.yaml -etc/sensor/sc2232.yaml -etc/init.d/S49ntpd -etc/init.d/S50snmpd -etc/init.d/S50telnet -etc/init.d/S60crond -etc/init.d/S92motion -etc/init.d/S93telegrambot -etc/init.d/S94rc.local \ No newline at end of file +/etc/sensor/gc2083-t31.bin +/etc/sensor/gc2083.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc2083_t31.ko +/etc/sensor/gc4023-t31.bin +/etc/sensor/gc4023.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc4023_t31.ko +/etc/sensor/gc4653-t31.bin +/etc/sensor/gc4653.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc4653_t31.ko +/etc/sensor/imx327-t31.bin +/etc/sensor/imx327.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_imx327_t31.ko +/etc/sensor/jxf37-t31.bin +/etc/sensor/jxf37.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxf37_t31.ko +/etc/sensor/jxh62-t31.bin +/etc/sensor/jxh62.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxh62_t31.ko +/etc/sensor/jxh63.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxh63_t31.ko +/etc/sensor/jxq03p-t31.bin +/etc/sensor/jxq03p.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03p_t31.ko +/etc/sensor/jxq03-t31.bin +/etc/sensor/jxq03.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03_t31.ko +/etc/sensor/sc200ai-t31.bin +/etc/sensor/sc200ai.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc200ai_t31.ko +/etc/sensor/sc2232h-t31.bin +/etc/sensor/sc2232h.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc2232h_t31.ko +/etc/sensor/sc2335-t31.bin +/etc/sensor/sc2335.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc2335_t31.ko +/etc/sensor/sc2336-t31.bin +/etc/sensor/sc2336.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc2336_t31.ko +/etc/sensor/sc3335-t31.bin +/etc/sensor/sc3335.yaml +/etc/sensor/sc3338-t31.bin +/etc/sensor/sc3338.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc3338_t31.ko +/etc/sensor/sc4236-t31.bin +/etc/sensor/sc4236.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc4236_t31.ko +/etc/sensor/sc5235-t31.bin +/etc/sensor/sc5235.yaml +/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc5235_t31.ko +/etc/sensor/jxf22.yaml +/etc/sensor/jxf23.yaml +/etc/sensor/jxh42.yaml +/etc/sensor/jxk04.yaml +/etc/sensor/os03b10.yaml +/etc/sensor/ov2735b.yaml +/etc/sensor/ov2735.yaml +/etc/sensor/ov4689.yaml +/etc/sensor/ps5260.yaml +/etc/sensor/sc2232.yaml +# +/etc/init.d/S49ntpd +/etc/init.d/S50snmpd +/etc/init.d/S50telnet +/etc/init.d/S60crond +/etc/init.d/S92motion +/etc/init.d/S93telegrambot +/etc/init.d/S94rc.local \ No newline at end of file