From 51b937ab315cf87541fdef72d6893a3d96a210a1 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Wed, 15 Dec 2021 22:49:31 +0800 Subject: [PATCH] remove stretch support in rootfs --- bsp/rootfs/build.sh | 49 ++++++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/bsp/rootfs/build.sh b/bsp/rootfs/build.sh index c692d4c..3387fc8 100755 --- a/bsp/rootfs/build.sh +++ b/bsp/rootfs/build.sh @@ -8,14 +8,11 @@ DRV_PATH=${PRJ_PATH}/driver TAR_PATH=${PRJ_PATH}/../tarball -# tarballs download URL address -WEB_URL=http://192.168.2.193:9000/${BOARD} - -# rootfs should be buildroot/yocto or stretch/buster/bullseye for debian system -ROOTFS=buster +# rootfs should be buildroot/yocto or buster/bullseye for debian system +ROOTFS=buildroot ROOTFS_DIR=rootfs_${ROOTFS} -ARCH=arm64 +ARCH=armhf # rootfs configuration DEF_USER=lingyun @@ -96,14 +93,6 @@ chroot ${ROOTFS_DIR} dpkg --configure -a printf "\n\n -- debootstrap fetch done -- \n\n" - # set root password - chroot ${ROOTFS_DIR} sh -c "echo root:${DEF_PASSWD} | chpasswd" - - # add extra user account - chroot ${ROOTFS_DIR} sh -c "useradd -m -G sudo -s /bin/bash ${DEF_USER}" - chroot ${ROOTFS_DIR} sh -c "echo ${DEF_USER}:${DEF_PASSWD} | chpasswd" - chroot ${ROOTFS_DIR} sh -c "usermod -G video,audio ${DEF_USER}" - # Clear the MD5 value to install extra apps sed -i -e "s|.*md5val.*|\t\"md5val\":\"MD5_Auto_Generate_Here\"|g" $APT_CONF } @@ -143,6 +132,22 @@ sed -i -e "s|.*md5val.*|\t\"md5val\":\"$md5_calc\"|g" $APT_CONF printf "\n\n -- debootstrap apt install done --\n\n" + + # modify root password + chroot ${ROOTFS_DIR} sh -c "echo root:${DEF_PASSWD} | chpasswd" + + # add extra user account + set +e + grep "$DEF_USER" ${ROOTFS_DIR}/etc/passwd > /dev/null 2>&1 + if [ $? != 0 ] ; then + printf "\n\n -- setup default user account --\n\n" + chroot ${ROOTFS_DIR} sh -c "useradd -m -s /bin/bash ${DEF_USER}" + chroot ${ROOTFS_DIR} sh -c "echo ${DEF_USER}:${DEF_PASSWD} | chpasswd" + chroot ${ROOTFS_DIR} sh -c "usermod -G video,audio,sudo avnet" + + echo "${DEF_USER} ALL=(ALL:ALL) NOPASSWD:ALL" >> ${ROOTFS_DIR}/etc/sudoers + fi + set -e fi fi } @@ -158,6 +163,10 @@ 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/ + fi + printf "\n\n -- install kernel modules done --\n\n" } @@ -168,8 +177,12 @@ set +e # update hostnmae and issue + echo "GNU/Linux $ROOTFS \n \l, default password '$DEF_PASSWD'." > ${ROOTFS_DIR}/etc/issue echo $DEF_HOSTNAME > ${ROOTFS_DIR}/etc/hostname - echo "$BOARD GNU/Linux $ROOTFS \n \l, default password '$DEF_PASSWD'." > ${ROOTFS_DIR}/etc/issue + grep "$BOARD" ${ROOTFS_DIR}/etc/hosts > /dev/null 2>&1 + if [ $? != 0 ] ; then + echo "127.0.0.1 ${BOARD}" >> ${ROOTFS_DIR}/etc/hosts + fi # update dns server echo "nameserver 114.114.114.114" > ${ROOTFS_DIR}/etc/resolv.conf @@ -182,10 +195,8 @@ fi # permit root ssh login - grep "^PermitRootLogin" ${ROOTFS_DIR}/etc/ssh/sshd_config > /dev/null 2>&1 - if [ $? != 0 ] ; then - echo "PermitRootLogin yes" >> ${ROOTFS_DIR}/etc/ssh/sshd_config - fi + sed -i "s|^#PermitRootLogin.*|PermitRootLogin yes|g" ${ROOTFS_DIR}/etc/ssh/sshd_config + sed -i "s|^#PasswordAuthentication.*|PasswordAuthentication yes|g" ${ROOTFS_DIR}/etc/ssh/sshd_config set -e -- Gitblit v1.9.1