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 --- .../lxqt-themes/Wallpaper_ApalisT30.png | Bin 2875 -> 0 bytes .../lxqt-themes/Wallpaper_ApalisTK1.png | Bin 6202 -> 0 bytes .../lxqt-themes/Wallpaper_ColibriT20.png | Bin 2907 -> 0 bytes .../lxqt-themes/Wallpaper_ColibriT30.png | Bin 2900 -> 0 bytes .../lxqt-themes/lxqt-themes_%.bbappend | 5 +--- recipes-devtools/spidev-test/spidev-test.bb | 30 --------------------- recipes-images/images/packagegroup-tdx-cli.bb | 10 ------- .../images/packagegroup-tdx-graphical.bb | 6 ----- .../images/tdx-reference-multimedia-image.bb | 2 -- recipes-support/gpio-tool/files/tegra124/gpio-tool | Bin 439324 -> 0 bytes .../gpio-tool/files/tegra124m/gpio-tool | Bin 439324 -> 0 bytes recipes-support/gpio-tool/files/vf/gpio-tool | Bin 350164 -> 0 bytes 12 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisT30.png delete mode 100644 meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisTK1.png delete mode 100644 meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT20.png delete mode 100644 meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT30.png delete mode 100644 recipes-devtools/spidev-test/spidev-test.bb delete mode 100755 recipes-support/gpio-tool/files/tegra124/gpio-tool delete mode 100755 recipes-support/gpio-tool/files/tegra124m/gpio-tool delete mode 100755 recipes-support/gpio-tool/files/vf/gpio-tool diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisT30.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisT30.png deleted file mode 100644 index 50473a4..0000000 Binary files a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisT30.png and /dev/null differ diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisTK1.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisTK1.png deleted file mode 100644 index c2e560f..0000000 Binary files a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisTK1.png and /dev/null differ diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT20.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT20.png deleted file mode 100644 index e91c869..0000000 Binary files a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT20.png and /dev/null differ diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT30.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT30.png deleted file mode 100644 index 6af72d5..0000000 Binary files a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT30.png and /dev/null differ diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend index 3c2c82c..f88e38b 100644 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend +++ b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend @@ -1,9 +1,6 @@ WALLPAPER-MACHINE = "Wallpaper_Toradex.png" -WALLPAPER-MACHINE:colibri-t20 = "Wallpaper_ColibriT20.png" -WALLPAPER-MACHINE:colibri-t30 = "Wallpaper_ColibriT30.png" -WALLPAPER-MACHINE:apalis-t30 = "Wallpaper_ApalisT30.png" -WALLPAPER-MACHINE:apalis-tk1 = "Wallpaper_ApalisTK1.png" WALLPAPER-MACHINE:colibri-imx6ull = "Wallpaper_ColibriiMX6ULL.png" +WALLPAPER-MACHINE:colibri-imx6ull-emmc = "Wallpaper_ColibriiMX6ULL.png" WALLPAPER-MACHINE:colibri-imx7-emmc = "Wallpaper_ColibriiMX7D.png" FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-themes:" diff --git a/recipes-devtools/spidev-test/spidev-test.bb b/recipes-devtools/spidev-test/spidev-test.bb deleted file mode 100644 index 2c403e6..0000000 --- a/recipes-devtools/spidev-test/spidev-test.bb +++ /dev/null @@ -1,30 +0,0 @@ -COMPATIBLE_MACHINE = "(colibri-vf)" - -SUMMARY = "The Linux kernels spidev-test programm" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}" - -do_configure[depends] += "virtual/kernel:do_shared_workdir" -do_populate_lic[depends] += "virtual/kernel:do_shared_workdir" - -# the spidev_test.c example got moved to tools/spi/ starting with -# the v.4.5.y kernel -KERNELPATH = "tools/spi/spidev_test.c" -KERNELPATH-OLD = "Documentation/spi/spidev_test.c" - -do_compile () { - if [ -f "${STAGING_KERNEL_DIR}/${KERNELPATH}" ] - then - ${CC} ${LDFLAGS} ${STAGING_KERNEL_DIR}/${KERNELPATH} -o spidev_test - else - ${CC} ${LDFLAGS} ${STAGING_KERNEL_DIR}/${KERNELPATH-OLD} -o spidev_test - fi -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${S}/spidev_test ${D}${bindir}/ -} 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', \ diff --git a/recipes-support/gpio-tool/files/tegra124/gpio-tool b/recipes-support/gpio-tool/files/tegra124/gpio-tool deleted file mode 100755 index 56581b0..0000000 Binary files a/recipes-support/gpio-tool/files/tegra124/gpio-tool and /dev/null differ diff --git a/recipes-support/gpio-tool/files/tegra124m/gpio-tool b/recipes-support/gpio-tool/files/tegra124m/gpio-tool deleted file mode 100755 index 56581b0..0000000 Binary files a/recipes-support/gpio-tool/files/tegra124m/gpio-tool and /dev/null differ diff --git a/recipes-support/gpio-tool/files/vf/gpio-tool b/recipes-support/gpio-tool/files/vf/gpio-tool deleted file mode 100755 index 7d7d976..0000000 Binary files a/recipes-support/gpio-tool/files/vf/gpio-tool and /dev/null differ -- cgit v1.2.3