summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2022-08-01 15:23:55 +0200
committerMing Liu <ming.liu@toradex.com>2022-08-06 18:39:33 +0200
commitff29f4ef087da0d960ba7c778764e53c70f2e124 (patch)
tree3ac114a065bf63b0c6b55e6ee8e8b4005b6b5642
parent8356eee884fa129269797fa47677e9ced741fd7c (diff)
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 <ming.liu@toradex.com>
-rw-r--r--meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisT30.pngbin2875 -> 0 bytes
-rw-r--r--meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisTK1.pngbin6202 -> 0 bytes
-rw-r--r--meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT20.pngbin2907 -> 0 bytes
-rw-r--r--meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT30.pngbin2900 -> 0 bytes
-rw-r--r--meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend5
-rw-r--r--recipes-devtools/spidev-test/spidev-test.bb30
-rw-r--r--recipes-images/images/packagegroup-tdx-cli.bb10
-rw-r--r--recipes-images/images/packagegroup-tdx-graphical.bb6
-rw-r--r--recipes-images/images/tdx-reference-multimedia-image.bb2
-rwxr-xr-xrecipes-support/gpio-tool/files/tegra124/gpio-toolbin439324 -> 0 bytes
-rwxr-xr-xrecipes-support/gpio-tool/files/tegra124m/gpio-toolbin439324 -> 0 bytes
-rwxr-xr-xrecipes-support/gpio-tool/files/vf/gpio-toolbin350164 -> 0 bytes
12 files changed, 1 insertions, 52 deletions
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
--- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisT30.png
+++ /dev/null
Binary files 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
--- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisTK1.png
+++ /dev/null
Binary files 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
--- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT20.png
+++ /dev/null
Binary files 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
--- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriT30.png
+++ /dev/null
Binary files 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
--- a/recipes-support/gpio-tool/files/tegra124/gpio-tool
+++ /dev/null
Binary files 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
--- a/recipes-support/gpio-tool/files/tegra124m/gpio-tool
+++ /dev/null
Binary files 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
--- a/recipes-support/gpio-tool/files/vf/gpio-tool
+++ /dev/null
Binary files differ