OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Merge pull request #189 from cronyx/master 

keep libstdc++ if wifibroadcast package is selected
pull/190/head
Igor Zalatov 2022-02-24 12:26:38 +03:00 committed by GitHub
parent 0e028174f2 062bb62cff
commit 3ac2750179
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
building.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# OpenIPC.org | v.20220223 # OpenIPC.org | v.20220224
# #
MAX_KERNEL_SIZE=0x200000 # 2MiB, 2097152 MAX_KERNEL_SIZE=0x200000 # 2MiB, 2097152
@ -8,8 +8,6 @@ MAX_KERNEL_SIZE_EXPERIMENTAL=0x3E8480 # ~3.9MiB, 4097152
MAX_ROOTFS_SIZE=0x500000 # 5MiB, 5242880 MAX_ROOTFS_SIZE=0x500000 # 5MiB, 5242880
MAX_KERNEL_SIZE_ULTIMATE=0xC80000 # 12,5MiB, 13107200 MAX_KERNEL_SIZE_ULTIMATE=0xC80000 # 12,5MiB, 13107200
export REQUIRE_LIBSTDC=0
clone() { clone() {
sudo apt-get update -y ; apt-get install -y bc build-essential git unzip rsync autotools-dev automake libtool 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 git clone --depth=1 https://github.com/OpenIPC/firmware.git
@ -135,7 +133,6 @@ gk7205v200() {
} }
gk7205v200_fpv() { gk7205v200_fpv() {
export REQUIRE_LIBSTDC=1
soc="gk7205v200" soc="gk7205v200"
fresh && make PLATFORM=goke BOARD=unknown_unknown_${soc}_fpv all && rename fresh && make PLATFORM=goke BOARD=unknown_unknown_${soc}_fpv all && rename
} }
@ -151,7 +148,6 @@ gk7205v300() {
} }
gk7205v300_fpv() { gk7205v300_fpv() {
export REQUIRE_LIBSTDC=1
soc="gk7205v300" soc="gk7205v300"
fresh && make PLATFORM=goke BOARD=unknown_unknown_${soc}_fpv all && rename fresh && make PLATFORM=goke BOARD=unknown_unknown_${soc}_fpv all && rename
} }

6
scripts/executing_commands_for_musl.sh
View File

@ -12,6 +12,10 @@ 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}/lib/ld-uClibc.so.0
ln -sfv ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd ln -sfv ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd
# #
if [ $(echo $REQUIRE_LIBSTDC) -eq 0 ]; then
if grep -q ^BR2_PACKAGE_WIFIBROADCAST=y ${BR2_CONFIG}
then
echo "Keep libsdc++..."
else
rm -f ${TARGET_DIR}/usr/lib/libstdc++* rm -f ${TARGET_DIR}/usr/lib/libstdc++*
fi fi