From 513fc5cf11639653243df722c5606c89286c0d52 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Sun, 11 Dec 2022 13:48:07 +0800 Subject: [PATCH] Merge branch 'master' of ssh://master.iot-yun.club:2280/imx6ull --- yocto/meta-igkboard/hardknott/recipes-images/igkboard/linuxsys-image.bb | 6 +++--- tools/setup_tools.sh | 39 ++++++++++++++++++++++++++++++++++++++- yocto/meta-igkboard/honister/recipes-images/igkboard/linuxsys-image.bb | 2 +- yocto/meta-igkboard/kirkstone/recipes-images/igkboard/linuxsys-image.bb | 2 +- 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh index 4c75e07..02cb804 100755 --- a/tools/setup_tools.sh +++ b/tools/setup_tools.sh @@ -2,6 +2,8 @@ # This shell script used to setup imx6ull build envrionment # +LYFTP_PUB=http://wekei-iot.com:2211/imx/igkboard/tools/lintools + # display in yellow function pr_warn() { echo -e "\033[40;33m --W-- $1 \033[0m\n" @@ -45,7 +47,7 @@ systools="coreutils jq wget curl tree gawk sed unzip cpio lz4 lzop zstd rsync kmod kpartx tmux \ desktop-file-utils iputils-ping xterm diffstat chrpath asciidoc docbook-utils help2man \ build-essential gcc g++ make cmake automake groff socat flex texinfo bison texi2html \ - bc git cvs subversion mercurial autoconf autoconf-archive \ + git cvs subversion mercurial autoconf autoconf-archive \ python2 python3 python3-pip python3-pexpect python3-git python3-jinja2 libsdl1.2-dev \ lib32z1 libssl-dev libncurses-dev lib32ncurses-dev libgl1-mesa-dev libglu1-mesa-dev \ " @@ -67,6 +69,39 @@ binfmt-support qemu qemu-user-static debootstrap debian-archive-keyring " apt install -y $devtools + + #sudo update-alternatives --install /usr/bin/arm-linux-gnueabihf-gcc arm-linux-gnueabihf-gcc /usr/bin/arm-linux-gnueabihf-gcc-9 10 +} + +function install_buildroot() +{ + BUILDROOT_PATH=/opt/buildroot + BUILDROOT_NAME=cortexA7 + + BUILDROOT_VER=buildroot-2021.02.7-cortexA7 + BUILDROOT_TAR=${BUILDROOT_VER}.tar.bz2 + BUILDROOT_DLADDR=${LYFTP_PUB}/$BUILDROOT_TAR + + if [ -d ${BUILDROOT_PATH}/${BUILDROOT_NAME} ] ; then + pr_warn "Buildroot already installed to $BUILDROOT_PATH/$BUILDROOT_NAME" + return 0; + fi + + mkdir -p ${BUILDROOT_PATH} + + if [ ! -f $BUILDROOT_TAR ] ; then + pr_info "download $BUILDROOT_VER now..." + wget -c $BUILDROOT_DLADDR + fi + + pr_info "install $BUILDROOT_VER to $BUILDROOT_PATH/$BUILDROOT_NAME now..." + tar -xjf ${BUILDROOT_TAR} -C ${BUILDROOT_PATH} + + $BUILDROOT_PATH/$BUILDROOT_NAME/bin/arm-linux-gcc -v + + pr_info "Cross compiler: $BUILDROOT_PATH/$BUILDROOT_NAME/bin/arm-linux-" + + rm -f ${BUILDROOT_TAR} } # NXP document suggest cross compiler from ARM Developer: @@ -108,3 +143,5 @@ install_crosstool +#install_buildroot + diff --git a/yocto/meta-igkboard/hardknott/recipes-images/igkboard/linuxsys-image.bb b/yocto/meta-igkboard/hardknott/recipes-images/igkboard/linuxsys-image.bb index 09057c7..818de6b 100644 --- a/yocto/meta-igkboard/hardknott/recipes-images/igkboard/linuxsys-image.bb +++ b/yocto/meta-igkboard/hardknott/recipes-images/igkboard/linuxsys-image.bb @@ -19,7 +19,7 @@ packagegroup-fsl-tools-audio \ packagegroup-fsl-gstreamer1.0 \ packagegroup-fsl-gstreamer1.0-full \ - packagegroup-qt5-imx \ + packagegroup-qt6-imx \ packagegroup-misc-utils \ firmwared \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init', '', d)} \ @@ -37,14 +37,14 @@ libgpiod libgpiod-tools \ libevent libconfig boost ldd \ libmodbus libsocketcan canutils \ - wvdial ppp hostapd ntp iw \ + wvdial ppp hostapd ntp iw bridge-utils \ nodejs nodejs-npm tcpdump \ udev-extraconf usb-modeswitch \ " inherit extrausers -# generate by printf "%q\n" $(mkpasswd -m sha256crypt 12345) +# generate by printf "%q\n" $(mkpasswd -m sha256crypt 12345) PASSWD= "\$5\$CZyCdtQE9Dp\$kuAmtCHtAv3X5gL1/imI.g1lf.JChVAEkdA3.8Yw8j8" EXTRA_USERS_PARAMS = "\ usermod -p '${PASSWD}' root; \ diff --git a/yocto/meta-igkboard/honister/recipes-images/igkboard/linuxsys-image.bb b/yocto/meta-igkboard/honister/recipes-images/igkboard/linuxsys-image.bb index 24f2e6c..818de6b 100644 --- a/yocto/meta-igkboard/honister/recipes-images/igkboard/linuxsys-image.bb +++ b/yocto/meta-igkboard/honister/recipes-images/igkboard/linuxsys-image.bb @@ -37,7 +37,7 @@ libgpiod libgpiod-tools \ libevent libconfig boost ldd \ libmodbus libsocketcan canutils \ - wvdial ppp hostapd ntp iw \ + wvdial ppp hostapd ntp iw bridge-utils \ nodejs nodejs-npm tcpdump \ udev-extraconf usb-modeswitch \ " diff --git a/yocto/meta-igkboard/kirkstone/recipes-images/igkboard/linuxsys-image.bb b/yocto/meta-igkboard/kirkstone/recipes-images/igkboard/linuxsys-image.bb index 24f2e6c..818de6b 100644 --- a/yocto/meta-igkboard/kirkstone/recipes-images/igkboard/linuxsys-image.bb +++ b/yocto/meta-igkboard/kirkstone/recipes-images/igkboard/linuxsys-image.bb @@ -37,7 +37,7 @@ libgpiod libgpiod-tools \ libevent libconfig boost ldd \ libmodbus libsocketcan canutils \ - wvdial ppp hostapd ntp iw \ + wvdial ppp hostapd ntp iw bridge-utils \ nodejs nodejs-npm tcpdump \ udev-extraconf usb-modeswitch \ " -- Gitblit v1.9.1