From 3d54ef047586c26d2acfbcd9fe2612be24825120 Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 14 Apr 2023 23:00:43 +0300 Subject: [PATCH] fix hi3516ev200/ev300 fpv rootfs oversize --- .github/workflows/matrix_build.yml | 6 --- building.sh | 2 +- .../goke-osdrv-gk7205v200.mk | 2 +- scripts/excludes/gk7205v200_fpv.list | 38 +++++++++++++++++++ scripts/excludes/gk7205v200_lte.list | 38 +++++++++++++++++++ scripts/excludes/gk7205v300_fpv.list | 38 +++++++++++++++++++ scripts/excludes/gk7205v300_lte.list | 38 +++++++++++++++++++ scripts/excludes/hi3516ev200_fpv.list | 27 +++++++++++++ scripts/excludes/hi3516ev200_lte.list | 27 +++++++++++++ scripts/excludes/hi3516ev300_fpv.list | 27 +++++++++++++ scripts/excludes/hi3516ev300_lte.list | 27 +++++++++++++ scripts/excludes/t31_fpv.list | 1 + scripts/executing_commands_for_musl.sh | 8 ++++ 13 files changed, 271 insertions(+), 8 deletions(-) create mode 100644 scripts/excludes/gk7205v200_fpv.list create mode 100644 scripts/excludes/gk7205v200_lte.list create mode 100644 scripts/excludes/gk7205v300_fpv.list create mode 100644 scripts/excludes/gk7205v300_lte.list create mode 100644 scripts/excludes/hi3516ev200_fpv.list create mode 100644 scripts/excludes/hi3516ev200_lte.list create mode 100644 scripts/excludes/hi3516ev300_fpv.list create mode 100644 scripts/excludes/hi3516ev300_lte.list create mode 100644 scripts/excludes/t31_fpv.list diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index e813768b..f3223497 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -480,12 +480,6 @@ jobs: MAX_KERNEL_SIZE=${MAX_KERNEL_SIZE_ULTIMATE} MAX_ROOTFS_SIZE=${MAX_ROOTFS_SIZE_ULTIMATE} ;; - hi3516ev200|hi3516ev300) - if [[ "${{ matrix.release }}" == "fpv" ]]; then - MAX_KERNEL_SIZE=${MAX_KERNEL_SIZE_ULTIMATE} - MAX_ROOTFS_SIZE=${MAX_ROOTFS_SIZE_ULTIMATE} - fi - ;; esac case ${{ matrix.release }} in diff --git a/building.sh b/building.sh index ccafcc3d..8fa8a02d 100755 --- a/building.sh +++ b/building.sh @@ -159,7 +159,7 @@ should_fit() { } rename() { - if grep -q ultimate_defconfig ./output/.config || grep -q fpv_defconfig ./output/.config || grep -q lte_defconfig ./output/.config || grep -q sdcard_defconfig ./output/.config; then + if grep -q ultimate_defconfig ./output/.config || grep -q sdcard_defconfig ./output/.config; then should_fit uImage $MAX_KERNEL_SIZE_ULTIMATE should_fit rootfs.squashfs $MAX_ROOTFS_SIZE_ULTIMATE else diff --git a/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk b/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk index add098fa..8b422090 100644 --- a/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk +++ b/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk @@ -98,7 +98,7 @@ define GOKE_OSDRV_GK7205V200_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/libsns_gc4653_2l.so ## $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/libsns_imx290.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/libsns_imx307_2l.so - ## $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/libsns_imx307.so + $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/libsns_imx307.so ## $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/libsns_imx327_2l.so ## $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/libsns_imx327.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/sensor/libsns_imx335.so diff --git a/scripts/excludes/gk7205v200_fpv.list b/scripts/excludes/gk7205v200_fpv.list new file mode 100644 index 00000000..3b05bbda --- /dev/null +++ b/scripts/excludes/gk7205v200_fpv.list @@ -0,0 +1,38 @@ +/etc/init.d/S60crond +/etc/init.d/S49ntpd +/etc/init.d/S02klogd +/lib/modules/4.9.37/extra/gk7205v200_rgn.ko +/lib/modules/4.9.37/extra/gk7205v200_jpege.ko +/lib/modules/4.9.37/extra/gk7205v200_ive.ko +/lib/modules/4.9.37/extra/gk7205v200_aio.ko +/lib/modules/4.9.37/extra/gk7205v200_ai.ko +/lib/modules/4.9.37/extra/gk7205v200_ao.ko +/lib/modules/4.9.37/extra/gk7205v200_aenc.ko +/lib/modules/4.9.37/extra/gk7205v200_adec.ko +/lib/modules/4.9.37/extra/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/iq/f23.ini +/usr/lib/sensors/iq/gc2053.ini +/usr/lib/sensors/iq/sc2232.ini +/usr/lib/sensors/iq/sc2335.ini diff --git a/scripts/excludes/gk7205v200_lte.list b/scripts/excludes/gk7205v200_lte.list new file mode 100644 index 00000000..3b05bbda --- /dev/null +++ b/scripts/excludes/gk7205v200_lte.list @@ -0,0 +1,38 @@ +/etc/init.d/S60crond +/etc/init.d/S49ntpd +/etc/init.d/S02klogd +/lib/modules/4.9.37/extra/gk7205v200_rgn.ko +/lib/modules/4.9.37/extra/gk7205v200_jpege.ko +/lib/modules/4.9.37/extra/gk7205v200_ive.ko +/lib/modules/4.9.37/extra/gk7205v200_aio.ko +/lib/modules/4.9.37/extra/gk7205v200_ai.ko +/lib/modules/4.9.37/extra/gk7205v200_ao.ko +/lib/modules/4.9.37/extra/gk7205v200_aenc.ko +/lib/modules/4.9.37/extra/gk7205v200_adec.ko +/lib/modules/4.9.37/extra/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/iq/f23.ini +/usr/lib/sensors/iq/gc2053.ini +/usr/lib/sensors/iq/sc2232.ini +/usr/lib/sensors/iq/sc2335.ini diff --git a/scripts/excludes/gk7205v300_fpv.list b/scripts/excludes/gk7205v300_fpv.list new file mode 100644 index 00000000..3b05bbda --- /dev/null +++ b/scripts/excludes/gk7205v300_fpv.list @@ -0,0 +1,38 @@ +/etc/init.d/S60crond +/etc/init.d/S49ntpd +/etc/init.d/S02klogd +/lib/modules/4.9.37/extra/gk7205v200_rgn.ko +/lib/modules/4.9.37/extra/gk7205v200_jpege.ko +/lib/modules/4.9.37/extra/gk7205v200_ive.ko +/lib/modules/4.9.37/extra/gk7205v200_aio.ko +/lib/modules/4.9.37/extra/gk7205v200_ai.ko +/lib/modules/4.9.37/extra/gk7205v200_ao.ko +/lib/modules/4.9.37/extra/gk7205v200_aenc.ko +/lib/modules/4.9.37/extra/gk7205v200_adec.ko +/lib/modules/4.9.37/extra/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/iq/f23.ini +/usr/lib/sensors/iq/gc2053.ini +/usr/lib/sensors/iq/sc2232.ini +/usr/lib/sensors/iq/sc2335.ini diff --git a/scripts/excludes/gk7205v300_lte.list b/scripts/excludes/gk7205v300_lte.list new file mode 100644 index 00000000..3b05bbda --- /dev/null +++ b/scripts/excludes/gk7205v300_lte.list @@ -0,0 +1,38 @@ +/etc/init.d/S60crond +/etc/init.d/S49ntpd +/etc/init.d/S02klogd +/lib/modules/4.9.37/extra/gk7205v200_rgn.ko +/lib/modules/4.9.37/extra/gk7205v200_jpege.ko +/lib/modules/4.9.37/extra/gk7205v200_ive.ko +/lib/modules/4.9.37/extra/gk7205v200_aio.ko +/lib/modules/4.9.37/extra/gk7205v200_ai.ko +/lib/modules/4.9.37/extra/gk7205v200_ao.ko +/lib/modules/4.9.37/extra/gk7205v200_aenc.ko +/lib/modules/4.9.37/extra/gk7205v200_adec.ko +/lib/modules/4.9.37/extra/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/iq/f23.ini +/usr/lib/sensors/iq/gc2053.ini +/usr/lib/sensors/iq/sc2232.ini +/usr/lib/sensors/iq/sc2335.ini diff --git a/scripts/excludes/hi3516ev200_fpv.list b/scripts/excludes/hi3516ev200_fpv.list new file mode 100644 index 00000000..26ffe808 --- /dev/null +++ b/scripts/excludes/hi3516ev200_fpv.list @@ -0,0 +1,27 @@ +/etc/init.d/S60crond +/etc/init.d/S49ntpd +/etc/init.d/S02klogd +/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 +/usr/lib/sensors/iq/f23.ini +/usr/lib/sensors/iq/gc2053.ini +/usr/lib/sensors/iq/sc2232.ini +/usr/lib/sensors/iq/sc2335.ini diff --git a/scripts/excludes/hi3516ev200_lte.list b/scripts/excludes/hi3516ev200_lte.list new file mode 100644 index 00000000..26ffe808 --- /dev/null +++ b/scripts/excludes/hi3516ev200_lte.list @@ -0,0 +1,27 @@ +/etc/init.d/S60crond +/etc/init.d/S49ntpd +/etc/init.d/S02klogd +/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 +/usr/lib/sensors/iq/f23.ini +/usr/lib/sensors/iq/gc2053.ini +/usr/lib/sensors/iq/sc2232.ini +/usr/lib/sensors/iq/sc2335.ini diff --git a/scripts/excludes/hi3516ev300_fpv.list b/scripts/excludes/hi3516ev300_fpv.list new file mode 100644 index 00000000..26ffe808 --- /dev/null +++ b/scripts/excludes/hi3516ev300_fpv.list @@ -0,0 +1,27 @@ +/etc/init.d/S60crond +/etc/init.d/S49ntpd +/etc/init.d/S02klogd +/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 +/usr/lib/sensors/iq/f23.ini +/usr/lib/sensors/iq/gc2053.ini +/usr/lib/sensors/iq/sc2232.ini +/usr/lib/sensors/iq/sc2335.ini diff --git a/scripts/excludes/hi3516ev300_lte.list b/scripts/excludes/hi3516ev300_lte.list new file mode 100644 index 00000000..26ffe808 --- /dev/null +++ b/scripts/excludes/hi3516ev300_lte.list @@ -0,0 +1,27 @@ +/etc/init.d/S60crond +/etc/init.d/S49ntpd +/etc/init.d/S02klogd +/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 +/usr/lib/sensors/iq/f23.ini +/usr/lib/sensors/iq/gc2053.ini +/usr/lib/sensors/iq/sc2232.ini +/usr/lib/sensors/iq/sc2335.ini diff --git a/scripts/excludes/t31_fpv.list b/scripts/excludes/t31_fpv.list new file mode 100644 index 00000000..d69de977 --- /dev/null +++ b/scripts/excludes/t31_fpv.list @@ -0,0 +1 @@ +/var/test diff --git a/scripts/executing_commands_for_musl.sh b/scripts/executing_commands_for_musl.sh index df597ff1..ef1a3545 100755 --- a/scripts/executing_commands_for_musl.sh +++ b/scripts/executing_commands_for_musl.sh @@ -31,3 +31,11 @@ if ! grep -q ^BR2_PACKAGE_WIFIBROADCAST=y ${BR2_CONFIG} && \ fi rm -f ${TARGET_DIR}/usr/bin/gdbserver + +if grep -q fpv_defconfig ${BR2_CONFIG} || grep -q lte_defconfig ${BR2_CONFIG}; then + soc=$(grep defconfig ${BR2_CONFIG} | rev | cut -d "_" -f3- | cut -d "/" -f1 | rev) + release=$(cat ${TARGET_DIR}/usr/lib/os-release | grep BUILD_OPTION | cut -d "=" -f2) + for e in $(cat ${BASE_DIR}/../scripts/excludes/${soc}_${release}.list); do + rm -f ${TARGET_DIR}${e} + done +fi