From 88700c0fc909f6051241232a0bd7277781619d53 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Thu, 30 Dec 2021 15:13:46 +0800
Subject: [PATCH] update buildroot to fix debian sudo bug
---
bsp/rootfs/build.sh | 271 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 171 insertions(+), 100 deletions(-)
diff --git a/bsp/rootfs/build.sh b/bsp/rootfs/build.sh
index ef8ec8a..19e85aa 100755
--- a/bsp/rootfs/build.sh
+++ b/bsp/rootfs/build.sh
@@ -3,26 +3,24 @@
PRJ_PATH=`pwd`
PRJ_NAME=`basename ${PRJ_PATH}`
-BOARD=imx6ull
+# update by top build.sh
+BOARD=igkboard
+SYSTEM=buildroot
+DISTRO=2021.02
+SYSNAME=buildroot
-DRV_PATH=${PRJ_PATH}/driver
+ROOTFS_DIR=rootfs_${SYSNAME}
+
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_DIR=rootfs_${ROOTFS}
-ARCH=arm64
-
# rootfs configuration
+DEBIAN_URL=http://ftp.cn.debian.org/debian/
+ARCH=armhf
DEF_USER=lingyun
DEF_PASSWD=12345
DEF_HOSTNAME=${BOARD}
-APT_CONF=extra_apps.json
+APPS_CONF=extra_apps.json
set -u
set -e
@@ -36,12 +34,12 @@
STAGE=0
function msg_banner()
-{
+{
STAGE=`expr $STAGE + 1`
-
+
echo ""
- echo "+---------------------------------------------+"
- printf " Stage $STAGE: $1\n"
+ echo "+---------------------------------------------+"
+ printf " Stage $STAGE: $1\n"
echo "+---------------------------------------------+"
echo ""
}
@@ -50,12 +48,12 @@
{
if [ -d ${ROOTFS_DIR} ] ; then
printf "\n\n -- ${ROOTFS_DIR} fetched already, skip it -- \n\n"
- return;
+ return;
fi
- if [ -s ${TAR_PATH}/${ROOTFS_DIR}.tar.bz2 ] ; then
- printf "\n\n -- decompress ${ROOTFS_DIR}.tar.bz2 -- \n\n"
- mkdir -p ${ROOTFS_DIR}
+ if [ -s ${TAR_PATH}/${ROOTFS_DIR}.tar.bz2 ] ; then
+ printf "\n\n -- decompress ${ROOTFS_DIR}.tar.bz2 -- \n\n"
+ mkdir -p ${ROOTFS_DIR}
tar -xjf ${TAR_PATH}/${ROOTFS_DIR}.tar.bz2 -C ${ROOTFS_DIR}
fi
@@ -63,7 +61,7 @@
}
-# debootstrap fetch debian rootfs
+# decompress rootfs packet or debootstrap fetch debian rootfs
function do_fetch()
{
msg_banner " ${ROOTFS_DIR} do fetch "
@@ -71,94 +69,155 @@
# try to decompress packet first.
do_unpack
- if [ $ROOTFS == "buildroot" -o $ROOTFS == "yocto" ] ; then
- if [ ! -d ${ROOTFS_DIR} ] ; then
- echo " ERROR: miss rootfs ${ROOTFS}, exit now. "
+ # Yocto and buildroot rootfs decompress only
+ if [ -d ${ROOTFS_DIR} ] ; then
+ return ;
+ else
+ if [ $SYSTEM != "debian" ] ; then
+ echo " ERROR: miss ${SYSTEM}(${DISTRO}) rootfs, exit now. "
echo ""
exit;
- else
- return 0;
fi
fi
+ # debootstrap fetch debian rootfs
export DEBIAN_FRONTEND=noninteractive
export DEBCONF_NONINTERACTIVE_SEEN=true
export LC_ALL=C
export LANGUAGE=C
- export LANG=C
+ export LANG=C
- printf "\n\n -- debootstrap fetch start --\n\n"
- debootstrap --arch=${ARCH} --foreign ${ROOTFS} ${ROOTFS_DIR} http://ftp.cn.debian.org/debian/
+ printf "\n\n -- debootstrap fetch start --\n\n"
+ echo "debootstrap --arch=${ARCH} --foreign ${DISTRO} ${ROOTFS_DIR} ${DEBIAN_URL}"
+ debootstrap --arch=${ARCH} --foreign ${DISTRO} ${ROOTFS_DIR} ${DEBIAN_URL}
- chroot ${ROOTFS_DIR} debootstrap/debootstrap --second-stage
- printf "\n\n -- debootstrap config start --\n\n"
+ chroot ${ROOTFS_DIR} debootstrap/debootstrap --second-stage
+ printf "\n\n -- debootstrap config start --\n\n"
- chroot ${ROOTFS_DIR} dpkg --configure -a
- printf "\n\n -- debootstrap fetch done -- \n\n"
+ 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"
+ # Clear the MD5 value to install extra apps
+ sed -i -e "s|.*md5apt.*|\t\"md5apt\":\"MD5_Auto_Generate_Here\"|g" $APPS_CONF
- # 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
+ cd ${ROOTFS_DIR}
+ tar -cjf ../${ROOTFS_DIR}.orig.tar.bz2 *
+ cd -
}
+
# Install extra apps defined in extra_apps.conf
-function do_apt()
+function do_extra_apt()
{
- export DEBIAN_FRONTEND=noninteractive
- export DEBCONF_NONINTERACTIVE_SEEN=true
- export LC_ALL=C
- export LANGUAGE=C
- export LANG=C
+ if [ ! -f $APPS_CONF ] ; then
+ return ;
+ fi
+
+ extra_apps=$(eval jq -r .extra_debian_apps[] $APPS_CONF )
+ md5_file=$(eval jq -r .md5apt $APPS_CONF)
+ md5_calc=$(eval echo $extra_apps | md5sum | awk '{print $1}')
+
+ if [ $md5_file == $md5_calc ] ; then
+ printf "\n\n -- debootstrap apt install already, skip it! --\n\n"
+ return ;
+ fi
msg_banner " debootstrap apt install "
- if [ -f $APT_CONF ] ; then
- extra_apps=$(eval jq -r .extra_apps[] $APT_CONF )
- md5_file=$(eval jq -r .md5val extra_apps.json)
- md5_calc=$(eval echo $extra_apps | md5sum | awk '{print $1}')
+ export DEBIAN_FRONTEND=noninteractive
+ export DEBCONF_NONINTERACTIVE_SEEN=true
+ export LC_ALL=C
+ export LANGUAGE=C
+ export LANG=C
- if [ $md5_file == $md5_calc ] ; then
- printf "\n\n -- debootstrap apt install already, skip it! --\n\n"
- else
- printf "\n\n -- debootstrap apt install start --\n\n"
+ cp -f /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/
+ mount -o bind /proc ${ROOTFS_DIR}/proc
+ mount -o bind /dev ${ROOTFS_DIR}/dev
+ mount -o bind /dev/pts ${ROOTFS_DIR}/dev/pts
+ mount -o bind /sys ${ROOTFS_DIR}/sys
- cp -f /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/
- mount -o bind /proc ${ROOTFS_DIR}/proc
- mount -o bind /dev ${ROOTFS_DIR}/dev
- mount -o bind /dev/pts ${ROOTFS_DIR}/dev/pts
- mount -o bind /sys ${ROOTFS_DIR}/sys
+ chroot ${ROOTFS_DIR} apt update
+ chroot ${ROOTFS_DIR} apt install -y ${extra_apps}
+ chroot ${ROOTFS_DIR} apt autoremove
- chroot ${ROOTFS_DIR} apt update
- chroot ${ROOTFS_DIR} apt install -y ${extra_apps}
+ umount ${ROOTFS_DIR}/{sys,proc,dev/pts,dev}
- umount ${ROOTFS_DIR}/{sys,proc,dev/pts,dev}
- sed -i -e "s|.*md5val.*|\t\"md5val\":\"$md5_calc\"|g" $APT_CONF
- printf "\n\n -- debootstrap apt install done --\n\n"
- fi
+ sed -i -e "s|.*md5apt.*|\t\"md5apt\":\"$md5_calc\"|g" $APPS_CONF
+ printf "\n\n -- debootstrap apt install done --\n\n"
+
+ # modify root password
+ chroot ${ROOTFS_DIR} sh -c "echo root:${DEF_PASSWD} | chpasswd"
+
+ # add default 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 -aG video,audio,sudo ${DEF_USER}"
fi
+ set -e
}
-function do_modules()
+function install_file()
{
- if [ ! -d ${DRV_PATH}/lib/modules ] ; then
+ if [ $# != 1 ] ; then
return ;
- fi
+ fi
- msg_banner " install kernel modules"
+ # parser the source file and destination install path
+ src=`echo $1 | cut -d: -f1`
+ dst=${ROOTFS_DIR}/`echo $1 | cut -d: -f2`
- rm -rf ${ROOTFS_DIR}/lib/modules/
- cp -af ${DRV_PATH}/lib/modules ${ROOTFS_DIR}/lib/
+ echo "install $src => $dst"
- printf "\n\n -- install kernel modules done --\n\n"
+ mkdir -p ${dst}
+
+ # parser to get .tar.gz .tar.bz2 .tar.xz
+ fname=`basename ${src}`
+ suffix=`echo "${fname#*.}"`
+
+ case $suffix in
+ tar.gz)
+ tar -xzf ${src} -C ${dst}
+ ;;
+
+ tar.bz2)
+ tar -xjf ${src} -C ${dst}
+ ;;
+
+ tar.xz)
+ tar -xJf ${src} -C ${dst}
+ ;;
+
+ *)
+ rm -rf ${dst}/${fname}
+ cp -rf ${src} ${dst}
+ ;;
+
+ esac
+}
+
+function do_install()
+{
+ # apt install extra packet for debian rootfs
+ if [ $SYSTEM == "debian" ] ; then
+ do_extra_apt
+ fi
+
+ # install common files for all the system
+ for row in $( jq -r '.extra_common_files | keys[] as $k | "\($k):\(.[$k])"' $APPS_CONF ) ; do
+ install_file $row
+ done
+
+ # install extra files for custom system
+ jq_args=".extra_${SYSTEM}_files | keys[] as \$k | \"\(\$k):\(.[\$k])\""
+ for row in $( jq -r "${jq_args}" $APPS_CONF ) ; do
+ install_file $row
+ done
}
function do_modify()
@@ -168,23 +227,43 @@
set +e
# update hostnmae and issue
+ echo "Welcome to LingYun IoT Gateway Kit Board GNU/Linux ${SYSTEM}(${DISTRO}) system, 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
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
+ sed -i 's|PATH=.*|PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"|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
+ # update sudo without passwd for yocto and debian
+ if [ $SYSTEM != buildroot ] ; then
+ sed -i "s|^%sudo.*|%sudo ALL=(ALL:ALL) NOPASSWD:ALL|g" ${ROOTFS_DIR}/etc/sudoers
+ 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
+ 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
+
+ # add vim alias for buildroot and yocto
+ if [ $SYSTEM != "debian" ] ; then
+ grep "alias vim=" ${ROOTFS_DIR}/etc/profile > /dev/null 2>&1
+ if [ $? != 0 ] ; then
+ echo "alias vim='vi'" >> ${ROOTFS_DIR}/etc/profile
+ fi
fi
set -e
@@ -222,32 +301,24 @@
function do_rootfs()
{
- do_fetch
-
- echo "do rootfs continue "
-
- # debian rootfs need apt install packet
- if [ $ROOTFS != "buildroot" -a $ROOTFS != "yocto" ] ;then
- do_apt
- fi
-
- do_modules
- do_modify
+ do_fetch
+ do_install
+ do_modify
do_pack
}
function do_root()
{
echo ""
- if [[ $1 == "yes" ]] && [ `id -u` != 0 ] ; then
+ if [[ $1 == "yes" ]] && [ `id -u` != 0 ] ; then
echo "ERROR: This action must run as root!"
echo ""
exit;
- elif [[ $1 != "yes" ]] && [ `id -u` == 0 ] ; then
+ elif [[ $1 != "yes" ]] && [ `id -u` == 0 ] ; then
echo "ERROR: This action cannot run as root!"
echo ""
exit;
- fi
+ fi
}
function do_usage()
@@ -266,22 +337,22 @@
while getopts "bch" OPTNAME
do
- case "${OPTNAME}" in
- "b")
+ case "${OPTNAME}" in
+ "b")
break;
- ;;
+ ;;
- "c")
+ "c")
do_root "yes"
do_distclean
- ;;
+ ;;
"*")
do_usage
- ;;
+ ;;
esac
done
-do_root "yes"
+do_root "yes"
do_rootfs
--
Gitblit v1.9.1