From 08bdac38c7c367b2f6bdbb6f98ba9067fbca3fc2 Mon Sep 17 00:00:00 2001
From: Viktor <35473052+viktorxda@users.noreply.github.com>
Date: Tue, 23 Jan 2024 13:53:05 +0100
Subject: [PATCH] [no ci] Scripts: update exclude lists

---
 general/scripts/excludes/gk7202v300_lite.list |  2 +-
 general/scripts/excludes/gk7205v200_fpv.list  | 96 +++++++++----------
 general/scripts/excludes/gk7205v200_lite.list |  4 +-
 general/scripts/excludes/hi3516ev200_fpv.list | 70 +++++++-------
 .../scripts/excludes/hi3516ev200_lite.list    |  4 +-
 .../scripts/excludes/hi3518ev300_lite.list    |  4 +-
 .../scripts/excludes/ssc335_initramfs.list    | 41 ++++----
 general/scripts/excludes/t31_fpv.list         | 30 +++---
 general/scripts/rootfs_script.sh              |  2 +-
 9 files changed, 125 insertions(+), 128 deletions(-)

diff --git a/general/scripts/excludes/gk7202v300_lite.list b/general/scripts/excludes/gk7202v300_lite.list
index cad3ff92..615472ee 100644
--- a/general/scripts/excludes/gk7202v300_lite.list
+++ b/general/scripts/excludes/gk7202v300_lite.list
@@ -1 +1 @@
-usr/lib/sensors/libsns_imx307.so
+/usr/lib/sensors/libsns_imx307.so
diff --git a/general/scripts/excludes/gk7205v200_fpv.list b/general/scripts/excludes/gk7205v200_fpv.list
index 21ff1329..48305236 100644
--- a/general/scripts/excludes/gk7205v200_fpv.list
+++ b/general/scripts/excludes/gk7205v200_fpv.list
@@ -1,48 +1,48 @@
-etc/sensors/bt656_720p.ini
-etc/sensors/gc2053_i2c_1080p.ini
-etc/sensors/gc4653_i2c_4M.ini
-etc/sensors/jxf23_i2c_1080p.ini
-etc/sensors/jxf23_i2c_dc_1080p.ini
-etc/sensors/sc200ai_i2c_1080p.ini
-etc/sensors/sc2232h_i2c_1080p.ini
-etc/sensors/sc2239_i2c_1080p.ini
-etc/sensors/sc223a_i2c_1080p.ini
-etc/sensors/4l_sc223a_i2c_1080p.ini
-etc/sensors/sc2335_i2c_1080p.ini
-etc/sensors/iq/f23.ini
-etc/sensors/iq/gc2053.ini
-etc/sensors/iq/sc2232.ini
-etc/sensors/iq/sc2335.ini
-lib/modules/4.9.37/goke/gk7205v200_rgn.ko
-lib/modules/4.9.37/goke/gk7205v200_jpege.ko
-lib/modules/4.9.37/goke/gk7205v200_ive.ko
-lib/modules/4.9.37/goke/gk7205v200_aio.ko
-lib/modules/4.9.37/goke/gk7205v200_ai.ko
-lib/modules/4.9.37/goke/gk7205v200_ao.ko
-lib/modules/4.9.37/goke/gk7205v200_aenc.ko
-lib/modules/4.9.37/goke/gk7205v200_adec.ko
-lib/modules/4.9.37/goke/gk7205v200_acodec.ko
-usr/lib/sensors/libsns_ar0237.so
-usr/lib/sensors/libsns_bt656.so
-usr/lib/sensors/libsns_f23.so
-usr/lib/sensors/libsns_f37.so
-usr/lib/sensors/libsns_gc2053.so
-usr/lib/sensors/libsns_gc2053_forcar.so
-usr/lib/sensors/libsns_gc4653_2l.so
-usr/lib/sensors/libsns_imx290.so
-usr/lib/sensors/libsns_imx327.so
-usr/lib/sensors/libsns_imx327_2l.so
-usr/lib/sensors/libsns_os05a.so
-usr/lib/sensors/libsns_ov2718.so
-usr/lib/sensors/libsns_sc200ai.so
-usr/lib/sensors/libsns_sc2231.so
-usr/lib/sensors/libsns_sc2232h.so
-usr/lib/sensors/libsns_sc2235.so
-usr/lib/sensors/libsns_sc2239.so
-usr/lib/sensors/libsns_sc2335.so
-usr/lib/sensors/libsns_sc3235.so
-usr/lib/sensors/libsns_sc3335.so
-usr/lib/sensors/libsns_sc4236.so
-usr/lib/sensors/libsns_sc500ai.so
-usr/lib/sensors/libsns_sc223a.so
-usr/lib/sensors/libsns_sc223a_4l.so
+/etc/sensors/bt656_720p.ini
+/etc/sensors/gc2053_i2c_1080p.ini
+/etc/sensors/gc4653_i2c_4M.ini
+/etc/sensors/jxf23_i2c_1080p.ini
+/etc/sensors/jxf23_i2c_dc_1080p.ini
+/etc/sensors/sc200ai_i2c_1080p.ini
+/etc/sensors/sc2232h_i2c_1080p.ini
+/etc/sensors/sc2239_i2c_1080p.ini
+/etc/sensors/sc223a_i2c_1080p.ini
+/etc/sensors/4l_sc223a_i2c_1080p.ini
+/etc/sensors/sc2335_i2c_1080p.ini
+/etc/sensors/iq/f23.ini
+/etc/sensors/iq/gc2053.ini
+/etc/sensors/iq/sc2232.ini
+/etc/sensors/iq/sc2335.ini
+/lib/modules/4.9.37/goke/gk7205v200_rgn.ko
+/lib/modules/4.9.37/goke/gk7205v200_jpege.ko
+/lib/modules/4.9.37/goke/gk7205v200_ive.ko
+/lib/modules/4.9.37/goke/gk7205v200_aio.ko
+/lib/modules/4.9.37/goke/gk7205v200_ai.ko
+/lib/modules/4.9.37/goke/gk7205v200_ao.ko
+/lib/modules/4.9.37/goke/gk7205v200_aenc.ko
+/lib/modules/4.9.37/goke/gk7205v200_adec.ko
+/lib/modules/4.9.37/goke/gk7205v200_acodec.ko
+/lib/sensors/libsns_ar0237.so
+/lib/sensors/libsns_bt656.so
+/lib/sensors/libsns_f23.so
+/lib/sensors/libsns_f37.so
+/lib/sensors/libsns_gc2053.so
+/lib/sensors/libsns_gc2053_forcar.so
+/lib/sensors/libsns_gc4653_2l.so
+/lib/sensors/libsns_imx290.so
+/lib/sensors/libsns_imx327.so
+/lib/sensors/libsns_imx327_2l.so
+/lib/sensors/libsns_os05a.so
+/lib/sensors/libsns_ov2718.so
+/lib/sensors/libsns_sc200ai.so
+/lib/sensors/libsns_sc2231.so
+/lib/sensors/libsns_sc2232h.so
+/lib/sensors/libsns_sc2235.so
+/lib/sensors/libsns_sc2239.so
+/lib/sensors/libsns_sc2335.so
+/lib/sensors/libsns_sc3235.so
+/lib/sensors/libsns_sc3335.so
+/lib/sensors/libsns_sc4236.so
+/lib/sensors/libsns_sc500ai.so
+/lib/sensors/libsns_sc223a.so
+/lib/sensors/libsns_sc223a_4l.so
diff --git a/general/scripts/excludes/gk7205v200_lite.list b/general/scripts/excludes/gk7205v200_lite.list
index 81b1afd9..dde2a759 100644
--- a/general/scripts/excludes/gk7205v200_lite.list
+++ b/general/scripts/excludes/gk7205v200_lite.list
@@ -1,2 +1,2 @@
-usr/lib/sensors/libsns_imx307.so
-usr/lib/sensors/libsns_imx335.so
+/usr/lib/sensors/libsns_imx307.so
+/usr/lib/sensors/libsns_imx335.so
diff --git a/general/scripts/excludes/hi3516ev200_fpv.list b/general/scripts/excludes/hi3516ev200_fpv.list
index d527e5b7..77d3a4e1 100644
--- a/general/scripts/excludes/hi3516ev200_fpv.list
+++ b/general/scripts/excludes/hi3516ev200_fpv.list
@@ -1,35 +1,35 @@
-etc/sensors/gc2053_i2c_1080p.ini
-etc/sensors/jxf22_i2c_1080p.ini
-etc/sensors/jxf23_i2c_1080p.ini
-etc/sensors/jxf37_i2c_1080p.ini
-etc/sensors/sc2231_i2c_1080p.ini
-etc/sensors/sc2232h_i2c_1080p.ini
-etc/sensors/sc2239_i2c_1080p.ini
-etc/sensors/sc2315e_i2c_1080p.ini
-etc/sensors/sc3235_i2c_3M.ini
-etc/sensors/sc4236_i2c_3M.ini
-etc/sensors/sp2305_i2c_1080p.ini
-etc/sensors/iq/f23.ini
-etc/sensors/iq/gc2053.ini
-etc/sensors/iq/sc2232.ini
-etc/sensors/iq/sc2335.ini
-lib/modules/4.9.37/extra/open_rgn.ko
-lib/modules/4.9.37/extra/open_jpege.ko
-lib/modules/4.9.37/extra/open_ive.ko
-lib/modules/4.9.37/extra/open_aio.ko
-lib/modules/4.9.37/extra/open_ai.ko
-lib/modules/4.9.37/extra/open_ao.ko
-lib/modules/4.9.37/extra/open_aenc.ko
-lib/modules/4.9.37/extra/open_adec.ko
-lib/modules/4.9.37/extra/open_acodec.ko
-usr/lib/sensors/libsns_f22.so
-usr/lib/sensors/libsns_f23.so
-usr/lib/sensors/libsns_f37.so
-usr/lib/sensors/libsns_gc2053.so
-usr/lib/sensors/libsns_sc2231.so
-usr/lib/sensors/libsns_sc2232h.so
-usr/lib/sensors/libsns_sc2239.so
-usr/lib/sensors/libsns_sc2315e.so
-usr/lib/sensors/libsns_sc3235.so
-usr/lib/sensors/libsns_sc4236.so
-usr/lib/sensors/libsns_sp2305.so
+/etc/sensors/gc2053_i2c_1080p.ini
+/etc/sensors/jxf22_i2c_1080p.ini
+/etc/sensors/jxf23_i2c_1080p.ini
+/etc/sensors/jxf37_i2c_1080p.ini
+/etc/sensors/sc2231_i2c_1080p.ini
+/etc/sensors/sc2232h_i2c_1080p.ini
+/etc/sensors/sc2239_i2c_1080p.ini
+/etc/sensors/sc2315e_i2c_1080p.ini
+/etc/sensors/sc3235_i2c_3M.ini
+/etc/sensors/sc4236_i2c_3M.ini
+/etc/sensors/sp2305_i2c_1080p.ini
+/etc/sensors/iq/f23.ini
+/etc/sensors/iq/gc2053.ini
+/etc/sensors/iq/sc2232.ini
+/etc/sensors/iq/sc2335.ini
+/lib/modules/4.9.37/extra/open_rgn.ko
+/lib/modules/4.9.37/extra/open_jpege.ko
+/lib/modules/4.9.37/extra/open_ive.ko
+/lib/modules/4.9.37/extra/open_aio.ko
+/lib/modules/4.9.37/extra/open_ai.ko
+/lib/modules/4.9.37/extra/open_ao.ko
+/lib/modules/4.9.37/extra/open_aenc.ko
+/lib/modules/4.9.37/extra/open_adec.ko
+/lib/modules/4.9.37/extra/open_acodec.ko
+/lib/sensors/libsns_f22.so
+/lib/sensors/libsns_f23.so
+/lib/sensors/libsns_f37.so
+/lib/sensors/libsns_gc2053.so
+/lib/sensors/libsns_sc2231.so
+/lib/sensors/libsns_sc2232h.so
+/lib/sensors/libsns_sc2239.so
+/lib/sensors/libsns_sc2315e.so
+/lib/sensors/libsns_sc3235.so
+/lib/sensors/libsns_sc4236.so
+/lib/sensors/libsns_sp2305.so
diff --git a/general/scripts/excludes/hi3516ev200_lite.list b/general/scripts/excludes/hi3516ev200_lite.list
index 81b1afd9..dde2a759 100644
--- a/general/scripts/excludes/hi3516ev200_lite.list
+++ b/general/scripts/excludes/hi3516ev200_lite.list
@@ -1,2 +1,2 @@
-usr/lib/sensors/libsns_imx307.so
-usr/lib/sensors/libsns_imx335.so
+/usr/lib/sensors/libsns_imx307.so
+/usr/lib/sensors/libsns_imx335.so
diff --git a/general/scripts/excludes/hi3518ev300_lite.list b/general/scripts/excludes/hi3518ev300_lite.list
index 81b1afd9..dde2a759 100644
--- a/general/scripts/excludes/hi3518ev300_lite.list
+++ b/general/scripts/excludes/hi3518ev300_lite.list
@@ -1,2 +1,2 @@
-usr/lib/sensors/libsns_imx307.so
-usr/lib/sensors/libsns_imx335.so
+/usr/lib/sensors/libsns_imx307.so
+/usr/lib/sensors/libsns_imx335.so
diff --git a/general/scripts/excludes/ssc335_initramfs.list b/general/scripts/excludes/ssc335_initramfs.list
index f3349386..1df32fbd 100644
--- a/general/scripts/excludes/ssc335_initramfs.list
+++ b/general/scripts/excludes/ssc335_initramfs.list
@@ -1,22 +1,19 @@
-etc/init.d/S01syslogd
-etc/init.d/S10modules
-etc/init.d/S20urandom
-etc/init.d/S21rngd
-etc/init.d/S40mdev
-etc/init.d/S49ntpd
-etc/init.d/S50dropbear
-etc/init.d/S50snmpd
-lib/libatomic*
-lib/libgcc*
-sbin/ldconfig
-usr/bin/getconf
-usr/bin/ipcinfo
-usr/bin/ldd
-usr/lib/libjson-c.so.2
-usr/sbin/firstboot
-usr/sbin/pqtools
-usr/sbin/sysupgrade
-usr/sbin/telegram_bot
-etc/ssl
-lib/mdev
-lib/modules
+/etc/init.d/S01syslogd
+/etc/init.d/S10modules
+/etc/init.d/S20urandom
+/etc/init.d/S21rngd
+/etc/init.d/S40mdev
+/etc/init.d/S49ntpd
+/etc/init.d/S50dropbear
+/etc/init.d/S50snmpd
+/lib/libatomic*
+/lib/libgcc*
+/lib/libjson-c.so.2
+/bin/getconf
+/bin/ipcinfo
+/bin/ldd
+/sbin/ldconfig
+/sbin/firstboot
+/sbin/pqtools
+/sbin/sysupgrade
+/sbin/telegram_bot
diff --git a/general/scripts/excludes/t31_fpv.list b/general/scripts/excludes/t31_fpv.list
index 511e259f..e757986a 100644
--- a/general/scripts/excludes/t31_fpv.list
+++ b/general/scripts/excludes/t31_fpv.list
@@ -1,15 +1,15 @@
-etc/sensor/gc2083.yaml
-etc/sensor/gc2083-t31.bin
-etc/sensor/gc4023.yaml
-etc/sensor/gc4023-t31.bin
-etc/sensor/jxq03.yaml
-etc/sensor/jxq03-t31.bin
-etc/sensor/jxq03p.yaml
-etc/sensor/jxq03p-t31.bin
-etc/sensor/sc2232h.yaml
-etc/sensor/sc2232h-t31.bin
-lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc2083_t31.ko
-lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc4023_t31.ko
-lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03_t31.ko
-lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03p_t31.ko
-lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc2232h_t31.ko
+/etc/sensor/gc2083.yaml
+/etc/sensor/gc2083-t31.bin
+/etc/sensor/gc4023.yaml
+/etc/sensor/gc4023-t31.bin
+/etc/sensor/jxq03.yaml
+/etc/sensor/jxq03-t31.bin
+/etc/sensor/jxq03p.yaml
+/etc/sensor/jxq03p-t31.bin
+/etc/sensor/sc2232h.yaml
+/etc/sensor/sc2232h-t31.bin
+/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc2083_t31.ko
+/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc4023_t31.ko
+/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03_t31.ko
+/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03p_t31.ko
+/lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc2232h_t31.ko
diff --git a/general/scripts/rootfs_script.sh b/general/scripts/rootfs_script.sh
index adaf7922..78bddd0a 100755
--- a/general/scripts/rootfs_script.sh
+++ b/general/scripts/rootfs_script.sh
@@ -15,7 +15,7 @@ fi
 
 if grep -q "USES_MUSL" ${BR2_CONFIG}; then
   LIST=${BR2_EXTERNAL}/scripts/excludes/${OPENIPC_SOC_MODEL}_${OPENIPC_FLAVOR}.list
-  test -e ${LIST} && xargs -a ${LIST} -I % rm -rf ${TARGET_DIR}/%
+  test -e ${LIST} && xargs -a ${LIST} -I % rm -f ${TARGET_DIR}%
 
   ln -sf libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0
   ln -sf ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd