From 829e87f6cecc57c7b418384de2ca80ec977587b0 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sat, 18 Dec 2021 23:16:44 +0800
Subject: [PATCH] update wifi driver build.sh, remove noisy debug print
---
bsp/rootfs/build.sh | 67 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/bsp/rootfs/build.sh b/bsp/rootfs/build.sh
index 8ef1ffc..95a1814 100755
--- a/bsp/rootfs/build.sh
+++ b/bsp/rootfs/build.sh
@@ -3,16 +3,16 @@
PRJ_PATH=`pwd`
PRJ_NAME=`basename ${PRJ_PATH}`
-BOARD=imx6ull
+BOARD=igkboard
DRV_PATH=${PRJ_PATH}/driver
TAR_PATH=${PRJ_PATH}/../tarball
-# rootfs should be buildroot/yocto or stretch/buster/bullseye for debian system
+# rootfs should be buildroot/yocto or bullseye for debian system
ROOTFS=buildroot
ROOTFS_DIR=rootfs_${ROOTFS}
-ARCH=arm
+ARCH=armhf
# rootfs configuration
DEF_USER=lingyun
@@ -20,6 +20,7 @@
DEF_HOSTNAME=${BOARD}
APT_CONF=extra_apps.json
+PATCH_PATH=${PRJ_PATH}/files
set -u
set -e
@@ -68,13 +69,13 @@
# try to decompress packet first.
do_unpack
- if [ $ROOTFS == "buildroot" -o $ROOTFS == "yocto" ] ; then
- if [ ! -d ${ROOTFS_DIR} ] ; then
+ if [ -d ${ROOTFS_DIR} ] ; then
+ return ;
+ else
+ if [ $ROOTFS == "buildroot" -o $ROOTFS == "yocto" ] ; then
echo " ERROR: miss rootfs ${ROOTFS}, exit now. "
echo ""
exit;
- else
- return 0;
fi
fi
@@ -154,20 +155,44 @@
function do_modules()
{
- if [ ! -d ${DRV_PATH}/lib/modules ] ; then
+ msg_banner " install linux firmware"
+ if [ -s ${TAR_PATH}/firmware.tar.bz2 ] ; then
+ tar -xjf ${TAR_PATH}/firmware.tar.bz2 -C ${ROOTFS_DIR}/lib/
+ fi
+
+ if [ ! -d ${DRV_PATH}/lib/ ] ; then
return ;
fi
- msg_banner " install kernel modules"
+ if [ -d ${DRV_PATH}/lib/modules ] ; then
+ msg_banner " install kernel modules"
+ rm -rf ${ROOTFS_DIR}/lib/modules/
+ cp -af ${DRV_PATH}/lib/modules ${ROOTFS_DIR}/lib/
+ fi
+}
- rm -rf ${ROOTFS_DIR}/lib/modules/
- cp -af ${DRV_PATH}/lib/modules ${ROOTFS_DIR}/lib/
-
- if [ ! -d ${ROOTFS_DIR}/lib/firmware -a -s firmware.tar.bz2 ] ; then
- tar -xjf firmware.tar.bz2 -C ${ROOTFS_DIR}/lib/
+function do_buildroot()
+{
+ if [ $ROOTFS != "buildroot" ] ; then
+ return ;
fi
- printf "\n\n -- install kernel modules done --\n\n"
+ # add vim alias for vim
+ grep "alias vim=" ${ROOTFS_DIR}/etc/profile > /dev/null 2>&1
+ if [ $? != 0 ] ; then
+ echo "alias vim='vi'" >> ${ROOTFS_DIR}/etc/profile
+ fi
+
+ if [ -s ${PATCH_PATH}/S30WpaSupplicant ] ; then
+ cp ${PATCH_PATH}/S30WpaSupplicant ${ROOTFS_DIR}/etc/init.d/
+ chmod a+x ${ROOTFS_DIR}/etc/init.d/S30WpaSupplicant
+ fi
+
+ if [ -s ${PATCH_PATH}/wpa_supplicant.conf ] ; then
+ cp ${PATCH_PATH}/wpa_supplicant.conf ${ROOTFS_DIR}/etc/
+ fi
+
+ printf "\n\n -- modify buildroot rootfs done --\n\n"
}
function do_modify()
@@ -176,8 +201,11 @@
set +e
+ # modify for buildroot rootfs
+ do_buildroot
+
# update hostnmae and issue
- echo "GNU/Linux $ROOTFS \n \l, default password '$DEF_PASSWD'." > ${ROOTFS_DIR}/etc/issue
+ echo "Welcome to LingYun IoT Gateway Kit Board GNU/Linux $ROOTFS system, default password '$DEF_PASSWD'." > ${ROOTFS_DIR}/etc/issue
echo $DEF_HOSTNAME > ${ROOTFS_DIR}/etc/hostname
grep "$BOARD" ${ROOTFS_DIR}/etc/hosts > /dev/null 2>&1
if [ $? != 0 ] ; then
@@ -188,8 +216,13 @@
echo "nameserver 114.114.114.114" > ${ROOTFS_DIR}/etc/resolv.conf
echo "nameserver 223.5.5.5" >> ${ROOTFS_DIR}/etc/resolv.conf
+ # update profile
+ sed -i "s|PS1='# '|PS1='\\\u@\\\h:\\\w# '|g" ${ROOTFS_DIR}/etc/profile
+ sed -i "s|PS1='$ '|PS1='\\\u@\\\h:\\\w$ '|g" ${ROOTFS_DIR}/etc/profile
+
+
# add ls alias for display with color
- grep "color=auto" ${ROOTFS_DIR}/etc/profile > /dev/null 2>&1
+ grep "^alias ls=" ${ROOTFS_DIR}/etc/profile > /dev/null 2>&1
if [ $? != 0 ] ; then
echo "alias ls='ls --color=auto'" >> ${ROOTFS_DIR}/etc/profile
fi
--
Gitblit v1.9.1