From bf3c1b67a4b493288310170cc22d3ea3b3e3e781 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Mon, 15 Jul 2024 21:04:55 +0800 Subject: [PATCH] Yocto:IGKBoard-All: Add weston desktop support as default --- yocto/meta-igkboard/images/yocto-image-full.bb | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/yocto/meta-igkboard/images/yocto-image-full.bb b/yocto/meta-igkboard/images/yocto-image-full.bb index dec0f09..c31a3f9 100644 --- a/yocto/meta-igkboard/images/yocto-image-full.bb +++ b/yocto/meta-igkboard/images/yocto-image-full.bb @@ -1,4 +1,4 @@ -SUMMARY = "A console lite image for production" +SUMMARY = "A multimedia wth full command image for production" LICENSE = "MIT" inherit core-image @@ -23,11 +23,13 @@ hwcodecs \ ssh-server-openssh \ package-management \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', '', d), d)} \ " CONFLICT_DISTRO_FEATURES = "directfb" -CORE_IMAGE_EXTRA_INSTALL += " \ +CORE_IMAGE_EXTRA_INSTALL_BASE += " \ packagegroup-base-wifi \ packagegroup-imx-isp \ packagegroup-imx-security \ @@ -37,27 +39,48 @@ packagegroup-core-ssh-openssh \ packagegroup-fsl-gstreamer1.0 \ packagegroup-fsl-gstreamer1.0-full \ + packagegroup-fsl-tools-benchmark \ + packagegroup-fsl-opencv-imx \ packagegroup-qt6-modules \ packagegroup-misc-utils \ " -CORE_IMAGE_EXTRA_INSTALL += " \ - kernel-modules \ +CORE_IMAGE_EXTRA_INSTALL_BASE += " \ + kernel-modules hello-app hello-mod \ + rtl8188fu rtl8723du \ firmwared linux-firmware \ powertop tzdata ppp vim \ xz lrzsz rsync dos2unix \ gnupg parted inetutils \ hostapd wireless-tools iw \ - i2c-tools spidev-test \ + i2c-tools spidev-test spitools \ libgpiod libgpiod-tools \ + fb-test fbgrab libdrm ffmpeg \ opencv zbar v4l-utils yavta \ alsa-state pulseaudio-server \ - python3 python3-pip \ + python3 python3-pip tmux \ openssh-sftp openssh-sftp-server \ memtester pcsc-tools stunnel ntp \ - curl evtest cpufrequtils \ - dosfstools ethtool iproute2 \ + curl evtest cpufrequtils iperf3 \ + dosfstools ethtool iproute2 modemmanager \ e2fsprogs-mke2fs e2fsprogs-resize2fs \ + cryptodev-module openssl-bin \ + libsocketcan can-utils canutils \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland xterm', '', d)} \ +" + +# For machine igkboard-imx6ull +CORE_IMAGE_EXTRA_INSTALL = " \ + ${CORE_IMAGE_EXTRA_INSTALL_BASE} \ +" + +# For machine igkboard-imx8mp +CORE_IMAGE_EXTRA_INSTALL:igkboard-imx8mp = " \ + ${CORE_IMAGE_EXTRA_INSTALL_BASE} \ + packagegroup-fsl-tools-gpu \ + packagegroup-fsl-tools-gpu-external \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init', '', d)} \ + git gcc gcc-symlinks binutils automake cmake autoconf freerdp \ " modify_rootfs() { @@ -86,6 +109,7 @@ rm -rf ${IMAGE_ROOTFS}/lib/firmware/* mv ${IMAGE_ROOTFS}/lib/firmware/.bak/* ${IMAGE_ROOTFS}/lib/firmware/ + rm -rf ${IMAGE_ROOTFS}/lib/firmware/imx*.elf rm -rf ${IMAGE_ROOTFS}/lib/firmware/.bak } -- Gitblit v1.9.1