From ff29f4ef087da0d960ba7c778764e53c70f2e124 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 1 Aug 2022 15:23:55 +0200 Subject: meta: drop deprecated machine references We dont support the following machines any more: colibri-t20/colibri-t30/apalis-t30/apalis-tk1/colibri-vf, let's drop their references. The recipe spidev-test is only used by colibri-vf, also drop it. Related-to: ELB-4471 Signed-off-by: Ming Liu --- recipes-images/images/packagegroup-tdx-cli.bb | 10 ---------- recipes-images/images/packagegroup-tdx-graphical.bb | 6 ------ recipes-images/images/tdx-reference-multimedia-image.bb | 2 -- 3 files changed, 18 deletions(-) (limited to 'recipes-images') diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb index d73caf1..8b07b4a 100644 --- a/recipes-images/images/packagegroup-tdx-cli.bb +++ b/recipes-images/images/packagegroup-tdx-cli.bb @@ -77,7 +77,6 @@ RRECOMMENDS:packagegroup-devel-tdx-cli = "\ spidev-test \ strace \ " -RRECOMMENDS:packagegroup-devel-tdx-cli:remove:colibri-vf = "perf" SUMMARY:packagegroup-machine-tdx-cli = "Machine specific tools" RRECOMMENDS:packagegroup-machine-tdx-cli = "\ @@ -106,10 +105,6 @@ RRECOMMENDS_packagegroup-machine-tdx-cli:verdin-imx8mp = "\ RRECOMMENDS:packagegroup-machine-tdx-cli:mx8-generic-bsp = "\ mwifiexap \ " -RRECOMMENDS:packagegroup-machine-tdx-cli:tegra124 = "\ - hdmi-hotplug \ - kernel-modules \ -" SUMMARY:packagegroup-networking-tdx-cli = "Networking specific tools" RRECOMMENDS:packagegroup-networking-tdx-cli = "\ @@ -125,13 +120,11 @@ SUMMARY:packagegroup-utils-tdx-cli = "Useful utilities" # Entropy source daemon RANDOM_HELPER = "rng-tools" -RANDOM_HELPER:tegra124 = "haveged" USB_GADGET = " \ libusbgx \ libusbgx-examples \ " -USB_GADGET:tegra124 = "" RRECOMMENDS:packagegroup-utils-tdx-cli = "\ alsa-utils \ @@ -161,9 +154,6 @@ RRECOMMENDS:packagegroup-utils-tdx-cli = "\ RRECOMMENDS:packagegroup-utils-tdx-cli:append:mx8-generic-bsp = " \ cpuburn-a53 \ " -RRECOMMENDS:packagegroup-utils-tdx-cli:append:tegra124 = " \ - tegrastats \ -" SUMMARY:packagegroup-utils-large-tdx-cli = "Useful utilities, but large footprint" RRECOMMENDS:packagegroup-utils-large-tdx-cli = "\ diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb index 1623110..f23f8d6 100644 --- a/recipes-images/images/packagegroup-tdx-graphical.bb +++ b/recipes-images/images/packagegroup-tdx-graphical.bb @@ -96,12 +96,6 @@ RRECOMMENDS:packagegroup-gpu-tdx-graphical:remove:mx8mm-nxp-bsp = " \ RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8qm-nxp-bsp = " \ libopenvx-imx \ " -RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:tegra124 = " \ - libglu \ - freeglut \ - tiff \ - xvinfo \ -" SUMMARY:packagegroup-x11-components-tdx-graphical = "Components of X11" RRECOMMENDS:packagegroup-x11-components-tdx-graphical = "\ diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb index 750546e..f9f285b 100644 --- a/recipes-images/images/tdx-reference-multimedia-image.bb +++ b/recipes-images/images/tdx-reference-multimedia-image.bb @@ -18,14 +18,12 @@ APP_LAUNCH_WAYLAND:colibri-imx6ull ?= "wayland-qtdemo-launch-analogclock" APP_LAUNCH_WAYLAND:colibri-imx6ull-emmc ?= "wayland-qtdemo-launch-analogclock" APP_LAUNCH_WAYLAND:colibri-imx7 ?= "wayland-qtdemo-launch-analogclock" APP_LAUNCH_WAYLAND:colibri-imx7-emmc ?= "wayland-qtdemo-launch-analogclock" -APP_LAUNCH_WAYLAND:apalis-tk1 ?= "wayland-qtdemo-launch-qtsmarthome" APP_LAUNCH_X11 ?= "x-window-qtcinematicexperience" APP_LAUNCH_X11:colibri-imx6ull ?= "x-window-analogclock" APP_LAUNCH_X11:colibri-imx6ull-emmc ?= "x-window-analogclock" APP_LAUNCH_X11:colibri-imx7 ?= "x-window-analogclock" APP_LAUNCH_X11:colibri-imx7-emmc ?= "x-window-analogclock" -APP_LAUNCH_X11:apalis-tk1 ?= "x-window-qtsmarthome" IMAGE_INSTALL += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ -- cgit v1.2.3