From 12270190290ea7311cefbdc8831387cef3de3816 Mon Sep 17 00:00:00 2001
From: cronyx <xcronyx@gmail.com>
Date: Wed, 23 Feb 2022 18:58:24 +0300
Subject: [PATCH] fix kernel and rootfs filesize checking, keep libstdc++ for
 fpv profile

---
 building.sh                            | 8 ++++++--
 scripts/executing_commands_for_musl.sh | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/building.sh b/building.sh
index b431fe14..e4e180e9 100755
--- a/building.sh
+++ b/building.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# OpenIPC.org | v.20220221
+# OpenIPC.org | v.20220223
 #
 
 MAX_KERNEL_SIZE=0x200000               #    2MiB,  2097152
@@ -8,6 +8,8 @@ MAX_KERNEL_SIZE_EXPERIMENTAL=0x3E8480  # ~3.9MiB,  4097152
 MAX_ROOTFS_SIZE=0x500000               #    5MiB,  5242880
 MAX_KERNEL_SIZE_ULTIMATE=0xC80000      # 12,5MiB, 13107200
 
+export REQUIRE_LIBSTDC=0
+
 clone() {
   sudo apt-get update -y ; apt-get install -y bc build-essential git unzip rsync autotools-dev automake libtool
   git clone --depth=1 https://github.com/OpenIPC/firmware.git
@@ -24,7 +26,7 @@ should_fit() {
   filename=$1
   maxsize=$2
   filesize=$(stat --printf="%s" ./output/images/$filename)
-  if [[ $filesize -gt $MAX_KERNEL_SIZE ]]; then
+  if [[ $filesize -gt $maxsize ]]; then
     export TG_NOTIFY="Warning: $filename is too large: $filesize vs $maxsize"
     exit 1
   fi
@@ -133,6 +135,7 @@ gk7205v200() {
 }
 
 gk7205v200_fpv() {
+  export REQUIRE_LIBSTDC=1
   soc="gk7205v200"
   fresh && make PLATFORM=goke BOARD=unknown_unknown_${soc}_fpv all && rename
 }
@@ -148,6 +151,7 @@ gk7205v300() {
 }
 
 gk7205v300_fpv() {
+  export REQUIRE_LIBSTDC=1
   soc="gk7205v300"
   fresh && make PLATFORM=goke BOARD=unknown_unknown_${soc}_fpv all && rename
 }
diff --git a/scripts/executing_commands_for_musl.sh b/scripts/executing_commands_for_musl.sh
index 39c5476f..31aa852c 100755
--- a/scripts/executing_commands_for_musl.sh
+++ b/scripts/executing_commands_for_musl.sh
@@ -12,6 +12,6 @@ echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"'
 ln -sfv /lib/libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0
 ln -sfv ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd
 #
-# Comment out this line if you want to save the libraries
-rm -f ${TARGET_DIR}/usr/lib/libstdc++*
-#
+if [ $(echo $REQUIRE_LIBSTDC) -eq 0 ]; then
+  rm -f ${TARGET_DIR}/usr/lib/libstdc++*
+fi