From 317b635e67ad6fc6d97f1eb52cecdd620e3bcc4d Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Wed, 15 Dec 2021 22:18:31 +0800 Subject: [PATCH] update rootfs, kernel, image build shell script --- bsp/images/build.sh | 1 + bsp/kernel/build.sh | 4 ++-- bsp/rootfs/build.sh | 9 ++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bsp/images/build.sh b/bsp/images/build.sh index 9e38993..ad0247a 100755 --- a/bsp/images/build.sh +++ b/bsp/images/build.sh @@ -165,6 +165,7 @@ mount -t ext4 /dev/mapper/${LOOP_DEV}p2 ${MNT_POINT} tar -xjf ${ROOTFS_TAR} -C ${MNT_POINT} && sync + chown -R root.root ${MNT_POINT} && sync umount ${MNT_POINT} } diff --git a/bsp/kernel/build.sh b/bsp/kernel/build.sh index cc41d88..e65ac90 100755 --- a/bsp/kernel/build.sh +++ b/bsp/kernel/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -INST_DRIVER=0 +INST_DRIVER=1 PRJ_PATH=`pwd` @@ -101,7 +101,7 @@ set +x if [ $INST_DRIVER != 0 ] ;then - make modules_install INSTALL_MOD_PATH=${PRJ_PATH}/../rootfs INSTALL_MOD_STRIP=1 + make modules_install INSTALL_MOD_PATH=${PRJ_PATH}/../rootfs/driver INSTALL_MOD_STRIP=1 fi cd ${PRJ_PATH} diff --git a/bsp/rootfs/build.sh b/bsp/rootfs/build.sh index b2ed997..8ef1ffc 100755 --- a/bsp/rootfs/build.sh +++ b/bsp/rootfs/build.sh @@ -8,9 +8,6 @@ DRV_PATH=${PRJ_PATH}/driver TAR_PATH=${PRJ_PATH}/../tarball -# tarballs download URL address -WEB_URL=http://weike-iot.com:2211/${BOARD}/bsp - # rootfs should be buildroot/yocto or stretch/buster/bullseye for debian system ROOTFS=buildroot @@ -198,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