project:app:rkipc:rkipc:Modify udhcpc for silent operation to suppress irrelevant information from being printed to the terminal

project:build.sh:Add support for multiple folders in post overlay
project:cfg:BoardConfig_IPC:Add support for rootfs post overlay
sysdrv:Makefile:Replace the script-based copying method with the post overlay approach

Signed-off-by: luckfox-eng29 <eng29@luckfox.com>
This commit is contained in:
luckfox-eng29
2024-11-02 18:41:51 +08:00
parent 7a66b04c61
commit 8fdf14595e
66 changed files with 3791 additions and 166 deletions

View File

@@ -1,40 +1,37 @@
#!/bin/sh
rcS()
{
for i in /oem/usr/etc/init.d/S??* ;do
rcS() {
for i in /oem/usr/etc/init.d/S??*; do
# Ignore dangling symlinks (if any).
[ ! -f "$i" ] && continue
case "$i" in
*.sh)
# Source shell script for speed.
(
trap - INT QUIT TSTP
set start
. $i
)
;;
*)
# No sh extension, so fork subprocess.
$i start
;;
*.sh)
# Source shell script for speed.
(
trap - INT QUIT TSTP
set start
. $i
)
;;
*)
# No sh extension, so fork subprocess.
$i start
;;
esac
done
}
check_linker()
{
[ ! -L "$2" ] && ln -sf $1 $2
check_linker() {
[ ! -L "$2" ] && ln -sf $1 $2
}
network_init()
{
ethaddr1=`ifconfig -a | grep "eth.*HWaddr" | awk '{print $5}'`
network_init() {
ethaddr1=$(ifconfig -a | grep "eth.*HWaddr" | awk '{print $5}')
if [ -f /data/ethaddr.txt ]; then
ethaddr2=`cat /data/ethaddr.txt`
ethaddr2=$(cat /data/ethaddr.txt)
if [ $ethaddr1 == $ethaddr2 ]; then
echo "eth HWaddr cfg ok"
else
@@ -42,18 +39,16 @@ network_init()
ifconfig eth0 hw ether $ethaddr2
fi
else
echo $ethaddr1 > /data/ethaddr.txt
echo $ethaddr1 >/data/ethaddr.txt
fi
ifconfig eth0 up && udhcpc -i eth0
ifconfig eth0 up && udhcpc -i eth0 >/dev/null 2>&1
}
post_chk()
{
post_chk() {
#TODO: ensure /userdata mount done
cnt=0
while [ $cnt -lt 30 ];
do
cnt=$(( cnt + 1 ))
while [ $cnt -lt 30 ]; do
cnt=$((cnt + 1))
if mount | grep -w userdata; then
break
fi
@@ -62,15 +57,15 @@ post_chk()
# if ko exist, install ko first
default_ko_dir=/ko
if [ -f "/oem/usr/ko/insmod_ko.sh" ];then
if [ -f "/oem/usr/ko/insmod_ko.sh" ]; then
default_ko_dir=/oem/usr/ko
fi
if [ -f "$default_ko_dir/insmod_ko.sh" ];then
if [ -f "$default_ko_dir/insmod_ko.sh" ]; then
cd $default_ko_dir && sh insmod_ko.sh && cd -
fi
network_init &
check_linker /userdata /oem/usr/www/userdata
check_linker /userdata /oem/usr/www/userdata
check_linker /media/usb0 /oem/usr/www/usb0
check_linker /mnt/sdcard /oem/usr/www/sdcard
# if /data/rkipc not exist, cp /usr/share
@@ -79,33 +74,35 @@ post_chk()
if [ ! -f "/oem/usr/share/rkipc.ini" ]; then
lsmod | grep sc530ai
if [ $? -eq 0 ] ;then
if [ $? -eq 0 ]; then
ln -s -f /oem/usr/share/rkipc-500w.ini $default_rkipc_ini
fi
lsmod | grep sc4336
if [ $? -eq 0 ] ;then
if [ $? -eq 0 ]; then
ln -s -f /oem/usr/share/rkipc-400w.ini $default_rkipc_ini
fi
lsmod | grep sc3336
if [ $? -eq 0 ] ;then
if [ $? -eq 0 ]; then
ln -s -f /oem/usr/share/rkipc-300w.ini $default_rkipc_ini
fi
fi
tmp_md5=/tmp/.rkipc-ini.md5sum
data_md5=/userdata/.rkipc-default.md5sum
md5sum $default_rkipc_ini > $tmp_md5
chk_rkipc=`cat $tmp_md5|awk '{print $1}'`
rm $tmp_md5
if [ ! -f $data_md5 ];then
md5sum $default_rkipc_ini > $data_md5
fi
grep -w $chk_rkipc $data_md5
if [ $? -ne 0 ] ;then
rm -f $rkipc_ini
echo "$chk_rkipc" > $data_md5
fi
if [ ! -f "$default_rkipc_ini" ];then
# check md5sum
# tmp_md5=/tmp/.rkipc-ini.md5sum
# data_md5=/userdata/.rkipc-default.md5sum
# md5sum $default_rkipc_ini > $tmp_md5
# chk_rkipc=`cat $tmp_md5|awk '{print $1}'`
# rm $tmp_md5
# if [ ! -f $data_md5 ];then
# md5sum $default_rkipc_ini > $data_md5
# fi
# grep -w $chk_rkipc $data_md5
# if [ $? -ne 0 ] ;then
# rm -f $rkipc_ini
# echo "$chk_rkipc" > $data_md5
# fi
if [ ! -f "$default_rkipc_ini" ]; then
echo "Error: not found rkipc.ini !!!"
exit -1
fi
@@ -117,7 +114,7 @@ post_chk()
cp -fa /oem/usr/share/image.bmp /userdata/
fi
if [ -d "/oem/usr/share/iqfiles" ];then
if [ -d "/oem/usr/share/iqfiles" ]; then
rkipc -a /oem/usr/share/iqfiles &
else
rkipc &
@@ -127,9 +124,9 @@ post_chk()
rcS
ulimit -c unlimited
echo "/data/core-%p-%e" > /proc/sys/kernel/core_pattern
echo "/data/core-%p-%e" >/proc/sys/kernel/core_pattern
# echo 0 > /sys/devices/platform/rkcif-mipi-lvds/is_use_dummybuf
echo 1 > /proc/sys/vm/overcommit_memory
echo 1 >/proc/sys/vm/overcommit_memory
post_chk &

View File

@@ -1,40 +1,37 @@
#!/bin/sh
rcS()
{
for i in /oem/usr/etc/init.d/S??* ;do
rcS() {
for i in /oem/usr/etc/init.d/S??*; do
# Ignore dangling symlinks (if any).
[ ! -f "$i" ] && continue
case "$i" in
*.sh)
# Source shell script for speed.
(
trap - INT QUIT TSTP
set start
. $i
)
;;
*)
# No sh extension, so fork subprocess.
$i start
;;
*.sh)
# Source shell script for speed.
(
trap - INT QUIT TSTP
set start
. $i
)
;;
*)
# No sh extension, so fork subprocess.
$i start
;;
esac
done
}
check_linker()
{
[ ! -L "$2" ] && ln -sf $1 $2
check_linker() {
[ ! -L "$2" ] && ln -sf $1 $2
}
network_init()
{
ethaddr1=`ifconfig -a | grep "eth.*HWaddr" | awk '{print $5}'`
network_init() {
ethaddr1=$(ifconfig -a | grep "eth.*HWaddr" | awk '{print $5}')
if [ -f /data/ethaddr.txt ]; then
ethaddr2=`cat /data/ethaddr.txt`
ethaddr2=$(cat /data/ethaddr.txt)
if [ $ethaddr1 == $ethaddr2 ]; then
echo "eth HWaddr cfg ok"
else
@@ -42,18 +39,16 @@ network_init()
ifconfig eth0 hw ether $ethaddr2
fi
else
echo $ethaddr1 > /data/ethaddr.txt
echo $ethaddr1 >/data/ethaddr.txt
fi
ifconfig eth0 up && udhcpc -i eth0
ifconfig eth0 up && udhcpc -i eth0 >/dev/null 2>&1
}
post_chk()
{
post_chk() {
#TODO: ensure /userdata mount done
cnt=0
while [ $cnt -lt 30 ];
do
cnt=$(( cnt + 1 ))
while [ $cnt -lt 30 ]; do
cnt=$((cnt + 1))
if mount | grep -w userdata; then
break
fi
@@ -62,15 +57,15 @@ post_chk()
# if ko exist, install ko first
default_ko_dir=/ko
if [ -f "/oem/usr/ko/insmod_ko.sh" ];then
if [ -f "/oem/usr/ko/insmod_ko.sh" ]; then
default_ko_dir=/oem/usr/ko
fi
if [ -f "$default_ko_dir/insmod_ko.sh" ];then
if [ -f "$default_ko_dir/insmod_ko.sh" ]; then
cd $default_ko_dir && sh insmod_ko.sh && cd -
fi
network_init &
check_linker /userdata /oem/usr/www/userdata
check_linker /userdata /oem/usr/www/userdata
check_linker /media/usb0 /oem/usr/www/usb0
check_linker /mnt/sdcard /oem/usr/www/sdcard
# if /data/rkipc not exist, cp /usr/share
@@ -79,37 +74,39 @@ post_chk()
if [ ! -f "/oem/usr/share/rkipc.ini" ]; then
lsmod | grep sc530ai
if [ $? -eq 0 ] ;then
if [ $? -eq 0 ]; then
ln -s -f /oem/usr/share/rkipc-500w.ini $default_rkipc_ini
fi
lsmod | grep sc4336
if [ $? -eq 0 ] ;then
if [ $? -eq 0 ]; then
ln -s -f /oem/usr/share/rkipc-400w.ini $default_rkipc_ini
fi
lsmod | grep sc3336
if [ $? -eq 0 ] ;then
if [ $? -eq 0 ]; then
ln -s -f /oem/usr/share/rkipc-300w.ini $default_rkipc_ini
fi
lsmod | grep imx415
if [ $? -eq 0 ] ;then
if [ $? -eq 0 ]; then
ln -s -f /oem/usr/share/rkipc-800w.ini $default_rkipc_ini
fi
fi
tmp_md5=/tmp/.rkipc-ini.md5sum
data_md5=/userdata/.rkipc-default.md5sum
md5sum $default_rkipc_ini > $tmp_md5
chk_rkipc=`cat $tmp_md5|awk '{print $1}'`
rm $tmp_md5
if [ ! -f $data_md5 ];then
md5sum $default_rkipc_ini > $data_md5
fi
grep -w $chk_rkipc $data_md5
if [ $? -ne 0 ] ;then
rm -f $rkipc_ini
echo "$chk_rkipc" > $data_md5
fi
if [ ! -f "$default_rkipc_ini" ];then
# check md5sum
# tmp_md5=/tmp/.rkipc-ini.md5sum
# data_md5=/userdata/.rkipc-default.md5sum
# md5sum $default_rkipc_ini > $tmp_md5
# chk_rkipc=`cat $tmp_md5|awk '{print $1}'`
# rm $tmp_md5
# if [ ! -f $data_md5 ];then
# md5sum $default_rkipc_ini > $data_md5
# fi
# grep -w $chk_rkipc $data_md5
# if [ $? -ne 0 ] ;then
# rm -f $rkipc_ini
# echo "$chk_rkipc" > $data_md5
# fi
if [ ! -f "$default_rkipc_ini" ]; then
echo "Error: not found rkipc.ini !!!"
exit -1
fi
@@ -121,11 +118,11 @@ post_chk()
cp -fa /oem/usr/share/image.bmp /userdata/
fi
if [ -f "/oem/usr/share/speaker_test.wav" ];then
if [ -f "/oem/usr/share/speaker_test.wav" ]; then
rk_mpi_ao_test -i /oem/usr/share/speaker_test.wav --sound_card_name=hw:0,0 --device_ch=2 --device_rate=8000 --input_rate=8000 --input_ch=2 --set_volume 50
fi
if [ -d "/oem/usr/share/iqfiles" ];then
if [ -d "/oem/usr/share/iqfiles" ]; then
rkipc -a /oem/usr/share/iqfiles &
else
rkipc &
@@ -135,9 +132,9 @@ post_chk()
rcS
ulimit -c unlimited
echo "/data/core-%p-%e" > /proc/sys/kernel/core_pattern
echo "/data/core-%p-%e" >/proc/sys/kernel/core_pattern
# echo 0 > /sys/devices/platform/rkcif-mipi-lvds/is_use_dummybuf
echo 1 > /proc/sys/vm/overcommit_memory
echo 1 >/proc/sys/vm/overcommit_memory
post_chk &

View File

@@ -1,14 +1,14 @@
*.o
#hostapd-2.6/hostapd/hostapd
#hostapd-2.6/hostapd/hostapd_cli
hostapd-2.6/hostapd/hostapd
hostapd-2.6/hostapd/hostapd_cli
install_out
libnl-3.4.0
out
#wifi/lib32/librkwifibt.so
#wifi/librkwifibt.so
#wifi/test/rkwifi_server
#wpa_supplicant-2.6/wpa_supplicant/libwpa_client.so
#wpa_supplicant-2.6/wpa_supplicant/wpa_cli
#wpa_supplicant-2.6/wpa_supplicant/wpa_passphrase
#wpa_supplicant-2.6/wpa_supplicant/wpa_supplicant
#wpa_supplicant_hostapd-0.8_rtw-2-ga8ef7c824.20200911
wifi/lib32/librkwifibt.so
wifi/librkwifibt.so
wifi/test/rkwifi_server
wpa_supplicant-2.6/wpa_supplicant/libwpa_client.so
wpa_supplicant-2.6/wpa_supplicant/wpa_cli
wpa_supplicant-2.6/wpa_supplicant/wpa_passphrase
wpa_supplicant-2.6/wpa_supplicant/wpa_supplicant
wpa_supplicant_hostapd-0.8_rtw-2-ga8ef7c824.20200911