summaryrefslogtreecommitdiff
path: root/recipes-images
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-04-23 11:27:19 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2019-04-23 12:42:02 +0200
commitc7fae0de5cae3b4bcf741d168101c06d5bdb8a8f (patch)
tree1de90216b756540aa5fc449c283a3de9f75755cb /recipes-images
parent45677492bbb2bec8215e421c4db22ac9cf9eacaf (diff)
colibri-vf: drop machine
We decided we won't do a BSP 3.0 for Vybrid. For new designs we recommend ULL now. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-images')
-rw-r--r--recipes-images/images/console-tdx-image.bb4
-rw-r--r--recipes-images/images/lxde-image.bb12
-rw-r--r--recipes-images/images/lxqt-image.bb9
-rw-r--r--recipes-images/images/qt-x11-image.bb6
-rw-r--r--recipes-images/images/qt4e-demo-image.bb4
-rw-r--r--recipes-images/images/qt5-x11-image.bb6
-rw-r--r--recipes-images/images/tdx-extra.inc14
7 files changed, 0 insertions, 55 deletions
diff --git a/recipes-images/images/console-tdx-image.bb b/recipes-images/images/console-tdx-image.bb
index 69ea3d2..594f0dc 100644
--- a/recipes-images/images/console-tdx-image.bb
+++ b/recipes-images/images/console-tdx-image.bb
@@ -14,7 +14,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
-IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -28,9 +27,6 @@ ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "
CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client"
-#don't install some id databases
-#BAD_RECOMMENDATIONS_append_colibri-vf += " udev-hwdb cpufrequtils "
-
#deploy the X server for the tegras
#this adds a few MB to the image, but all graphical HW acceleration is
#available only on top of X, this is not required for nouveau based build.
diff --git a/recipes-images/images/lxde-image.bb b/recipes-images/images/lxde-image.bb
index ae95155..e22e94f 100644
--- a/recipes-images/images/lxde-image.bb
+++ b/recipes-images/images/lxde-image.bb
@@ -14,7 +14,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
-IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -31,10 +30,6 @@ CONMANPKGS ?= "connman connman-client connman-gnome"
IMAGE_BROWSER = "firefox"
#keep the rootfs size small
IMAGE_BROWSER_colibri-imx6ull = ""
-IMAGE_BROWSER_colibri-vf = ""
-
-# don't install some packages bloating the vybrid image
-BAD_RECOMMENDATIONS_append_colibri-vf = " udev-hwdb cpufrequtils"
# this would pull in a large amount of gst-plugins, we only add a selected few
# gstreamer1.0-plugins-base-meta
@@ -131,8 +126,6 @@ GSTREAMER_append_tegra124 = " \
libgstomx-0.10 \
libgstomx-1.0 \
"
-GSTREAMER_colibri-vf = ""
-
IMAGE_INSTALL_append_tegra124 = " \
gpio-tool \
gnome-disk-utility \
@@ -172,11 +165,6 @@ IMAGE_INSTALL_append_mx7 = " \
gnome-disk-utility \
mime-support \
"
-IMAGE_INSTALL_append_vf = " \
- gpio-tool \
- xf86-video-modesetting \
-"
-
IMAGE_INSTALL_append_colibri-imx6ull = " \
gpio-tool \
"
diff --git a/recipes-images/images/lxqt-image.bb b/recipes-images/images/lxqt-image.bb
index f7e6738..f38bb6d 100644
--- a/recipes-images/images/lxqt-image.bb
+++ b/recipes-images/images/lxqt-image.bb
@@ -14,7 +14,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
-IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -35,10 +34,6 @@ CONMANPKGS ?= "connman connman-client lxqt-connman-applet"
IMAGE_BROWSER = "falkon"
#keep the rootfs size small
IMAGE_BROWSER_colibri-imx6ull = ""
-IMAGE_BROWSER_colibri-vf = ""
-
-# don't install some packages bloating the vybrid image
-BAD_RECOMMENDATIONS_append_colibri-vf = " udev-hwdb cpufrequtils"
# this would pull in a large amount of gst-plugins, we only add a selected few
# gstreamer1.0-plugins-base-meta
@@ -125,7 +120,6 @@ GSTREAMER_append_tegra124 = " \
libgstomx-0.10 \
libgstomx-1.0 \
"
-GSTREAMER_colibri-vf = ""
IMAGE_INSTALL_append_tegra124 = " \
libglu \
@@ -154,9 +148,6 @@ IMAGE_INSTALL_append_mx6dl = "${IMAGE_INSTALL_MX6QDL}"
IMAGE_INSTALL_append_mx7 = " \
mime-support \
"
-IMAGE_INSTALL_append_vf = " \
- xf86-video-modesetting \
-"
# Packages which might be empty or no longer available
RRECOMMENDS_${PN} += " \
diff --git a/recipes-images/images/qt-x11-image.bb b/recipes-images/images/qt-x11-image.bb
index 26158b3..0a81904 100644
--- a/recipes-images/images/qt-x11-image.bb
+++ b/recipes-images/images/qt-x11-image.bb
@@ -14,7 +14,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
-IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -28,9 +27,6 @@ ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "
CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client"
-#don't install some id databases
-#BAD_RECOMMENDATIONS_append_colibri-vf = " udev-hwdb cpufrequtils "
-
# this would pull in a large amount of gst-plugins, we only add a selected few
# gstreamer1.0-plugins-base-meta
# gstreamer1.0-plugins-good-meta
@@ -123,8 +119,6 @@ GSTREAMER_append_tegra124 = " \
libgstomx-0.10 \
libgstomx-1.0 \
"
-GSTREAMER_colibri-vf = ""
-
IMAGE_INSTALL_QT4 = " \
qt4-x11-free \
diff --git a/recipes-images/images/qt4e-demo-image.bb b/recipes-images/images/qt4e-demo-image.bb
index 7c43d4a..af85b9e 100644
--- a/recipes-images/images/qt4e-demo-image.bb
+++ b/recipes-images/images/qt4e-demo-image.bb
@@ -8,7 +8,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
-IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
#start graphical target by default (start new qt-demo-init systemd service)
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -22,9 +21,6 @@ ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "
CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client"
-#don't install some id databases
-#BAD_RECOMMENDATIONS_append_colibri-vf += " udev-hwdb cpufrequtils "
-
IMAGE_INSTALL += " \
packagegroup-core-qt4e \
libicui18n \
diff --git a/recipes-images/images/qt5-x11-image.bb b/recipes-images/images/qt5-x11-image.bb
index 5fe9cc6..66925ed 100644
--- a/recipes-images/images/qt5-x11-image.bb
+++ b/recipes-images/images/qt5-x11-image.bb
@@ -19,7 +19,6 @@ IMAGE_NAME_colibri-imx6ull = "Colibri-iMX6ULL_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}"
IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}"
-IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
SYSTEMD_DEFAULT_TARGET = "graphical.target"
@@ -35,9 +34,6 @@ ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "
CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client"
-#don't install some id databases
-#BAD_RECOMMENDATIONS_append_colibri-vf = " udev-hwdb cpufrequtils "
-
# this would pull in a large amount of gst-plugins, we only add a selected few
# gstreamer1.0-plugins-base-meta
# gstreamer1.0-plugins-good-meta
@@ -130,8 +126,6 @@ GSTREAMER_append_tegra124 = " \
libgstomx-0.10 \
libgstomx-1.0 \
"
-GSTREAMER_colibri-vf = ""
-
IMAGE_INSTALL_QT5 = " \
packagegroup-qt5 \
diff --git a/recipes-images/images/tdx-extra.inc b/recipes-images/images/tdx-extra.inc
index 4ac3469..da2776f 100644
--- a/recipes-images/images/tdx-extra.inc
+++ b/recipes-images/images/tdx-extra.inc
@@ -4,7 +4,6 @@
COPY_LIC_MANIFEST ?= "1"
#Bug with several MACHINES build, license files for all arch packages stored wrongly
COPY_LIC_DIRS ?= "1"
-COPY_LIC_DIRS_colibri-vf = "0"
add_rootfs_version () {
echo -n "${IMAGE_NAME} ${PV}" >> ${IMAGE_ROOTFS}/etc/issue
@@ -130,19 +129,6 @@ IMAGE_INSTALL_append_mx8 = " \
util-linux \
"
-IMAGE_INSTALL_append_vf = " \
- linuxptp \
- libusbgx \
- libusbgx-examples \
- ptpd \
- mtd-utils-ubifs \
- kernel-modules \
- usb-suspend-resume \
-"
-IMAGE_INSTALL_append_colibri-vf = " \
- u-boot-toradex-fw-utils \
-"
-
IMAGE_INSTALL += " \
packagegroup-dotnet-deps \
\