From 8b96db12b3d786707a688f3a6b57a7259a25d067 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 17 Jun 2020 18:53:27 +0200 Subject: tegra124m: drop override use Completes commit 8974d4bb8841 ("apalis-tk1-mainline: drop override use"). The downstream kernel gets to old to be used with the new zeus userspace components. Reuse the apalis-tk1 machine name to build a mainline kernel and drop the apalis-tk1-mainline machine. Related-to: ELB-2733 Signed-off-by: Max Krummenacher (cherry picked from commit 3a3f62d5002582ca064e8019f517fc538b763ef3) --- recipes-images/images/packagegroup-tdx-cli.bb | 9 +-------- recipes-images/images/packagegroup-tdx-graphical.bb | 9 --------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb index cfcc5df..d352587 100644 --- a/recipes-images/images/packagegroup-tdx-cli.bb +++ b/recipes-images/images/packagegroup-tdx-cli.bb @@ -97,11 +97,6 @@ RRECOMMENDS_packagegroup-machine-tdx-cli_tegra124 = "\ lvds-tegra124 \ kernel-modules \ " -RRECOMMENDS_packagegroup-machine-tdx-cli_tegra124m = "\ - hdmi-hotplug \ - lvds-tegra124 \ - kernel-modules \ -" SUMMARY_packagegroup-networking-tdx-cli = "Networking specific tools" RRECOMMENDS_packagegroup-networking-tdx-cli = "\ @@ -118,14 +113,12 @@ SUMMARY_packagegroup-utils-tdx-cli = "Useful utilities" # Entropy source daemon RANDOM_HELPER = "rng-tools" RANDOM_HELPER_tegra124 = "haveged" -RANDOM_HELPER_tegra124m = "haveged" +USB_GADGET = "" USB_GADGET_imx = " \ libusbgx \ libusbgx-examples \ " -USB_GADGET_tegra124 = "usb-rndis-systemd" -USB_GADGET_tegra124m = "" RRECOMMENDS_packagegroup-utils-tdx-cli = "\ alsa-utils \ diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb index a815fb0..fbff118 100644 --- a/recipes-images/images/packagegroup-tdx-graphical.bb +++ b/recipes-images/images/packagegroup-tdx-graphical.bb @@ -25,9 +25,6 @@ RRECOMMENDS_packagegroup-tdx-graphical = " \ RRECOMMENDS_packagegroup-tdx-graphical_append_mx8 = " \ packagegroup-drm-utils-tdx-graphical \ " -RRECOMMENDS_packagegroup-tdx-graphical_append_tegra124m = " \ - packagegroup-drm-utils-tdx-graphical \ -" SUMMARY_packagegroup-drm-utils-tdx-graphical = "Utilities for DRM, Direct Rendering Manager" RRECOMMENDS_packagegroup-drm-utils-tdx-graphical = " \ @@ -100,12 +97,6 @@ RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_tegra124 = " \ tiff \ xvinfo \ " -RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_tegra124m = " \ - libglu \ - freeglut \ - tiff \ - xvinfo \ -" SUMMARY_packagegroup-x11-components-tdx-graphical = "Components of X11" RRECOMMENDS_packagegroup-x11-components-tdx-graphical = "\ -- cgit v1.2.3