From 604d9133d7a18134fcdfb80c86d589088a7a4ee8 Mon Sep 17 00:00:00 2001 From: Guochunrong Date: Thu, 29 May 2025 16:16:31 +0800 Subject: [PATCH] core-image-xfce: exclude testapps and benchmark Signed-off-by: Guochunrong --- .../recipes-core/images/core-image-xfce.bb | 10 +++++---- .../xfce-perchannel-xml/xfce4-desktop.xml | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/meta-bsp/recipes-core/images/core-image-xfce.bb b/meta-bsp/recipes-core/images/core-image-xfce.bb index 5dd9188..7b984cb 100644 --- a/meta-bsp/recipes-core/images/core-image-xfce.bb +++ b/meta-bsp/recipes-core/images/core-image-xfce.bb @@ -1,6 +1,11 @@ DESCRIPTION = "A XFCE phytium demo image." -require phytium-image-networking.bb +require recipes-core/images/core-image-minimal.bb + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +CORE_IMAGE_EXTRA_INSTALL += "grub-efi lsb-release" + IMAGE_INSTALL = "packagegroup-core-boot \ packagegroup-core-x11 \ @@ -26,8 +31,6 @@ export IMAGE_BASENAME = "core-image-xfce" inherit core-image phy-utils -ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'rootfs_ln_xorg;', '', d)}" - ROOTFS_POSTPROCESS_COMMAND += "rootfs_copy_core_image;rootfs_copy_initrd;" do_rootfs[depends] += "phytium-image-initramfs:do_image_complete" @@ -43,7 +46,6 @@ IMAGE_INSTALL += " ${@bb.utils.contains('DISTRO_FEATURES', 'jailhouse', 'package ${@bb.utils.contains('DISTRO_FEATURES', 'audio', 'packagegroup-phy-tools-audio', '', d)} \ udev-extra-rules \ gtk+3 default-locale xdg-user-dirs \ - packagegroup-phy-tools-core-dev \ packagegroup-gui-base \ wireless-regdb-static \ ${@bb.utils.contains('MACHINE_FEATURES', 'sd', 'rtl8821cs iw wpa-supplicant', '', d)} \ diff --git a/meta-bsp/recipes-xfce/xfce-phytium-settings/files/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/meta-bsp/recipes-xfce/xfce-phytium-settings/files/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index d7a0166..72f5eb0 100644 --- a/meta-bsp/recipes-xfce/xfce-phytium-settings/files/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/meta-bsp/recipes-xfce/xfce-phytium-settings/files/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -47,6 +47,28 @@ + + + + + + + + + + + + + + + + + + + + + + -- Gitee