diff options
| author | Max Krummenacher <max.oss.09@gmail.com> | 2015-08-21 09:56:30 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.oss.09@gmail.com> | 2015-10-12 15:36:39 +0200 |
| commit | 468aa3aab3ad3a4c78788c0b65404d49fcde8ccd (patch) | |
| tree | f9bb8448945f4c6af536ba7ba25ad45603e934a5 | |
| parent | 50f8a4f9c45236726ec0e54b5757265827cb87f1 (diff) | |
images: install eglinfo-x11 only in x11 based images
Conflicts:
recipes/images/angstrom-qt-x11-image.bb
| -rw-r--r-- | recipes/images/angstrom-lxde-image.bb | 2 | ||||
| -rw-r--r-- | recipes/images/angstrom-qt-x11-image.bb | 4 | ||||
| -rw-r--r-- | recipes/images/trdx-extra.inc | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb index 394d10a..8cba09d 100644 --- a/recipes/images/angstrom-lxde-image.bb +++ b/recipes/images/angstrom-lxde-image.bb @@ -110,6 +110,7 @@ IMAGE_INSTALL_append_tegra = " \ tegrastats-gtk \ gnome-disk-utility \ mime-support \ + eglinfo-x11 \ " IMAGE_INSTALL_append_apalis-imx6 = " \ gpioconfig \ @@ -118,6 +119,7 @@ IMAGE_INSTALL_append_mx6 = " \ packagegroup-fsl-tools-gpu \ gnome-disk-utility \ mime-support \ + eglinfo-x11 \ " IMAGE_INSTALL_append_vf = " \ gpioconfig \ diff --git a/recipes/images/angstrom-qt-x11-image.bb b/recipes/images/angstrom-qt-x11-image.bb index 13d1124..1335870 100644 --- a/recipes/images/angstrom-qt-x11-image.bb +++ b/recipes/images/angstrom-qt-x11-image.bb @@ -133,8 +133,12 @@ IMAGE_INSTALL_QT4 = " \ icu \ " +IMAGE_INSTALL_append_tegra = " \ + eglinfo-x11 \ +" IMAGE_INSTALL_append_mx6 = " \ packagegroup-fsl-tools-gpu \ + eglinfo-x11 \ " IMAGE_INSTALL += " \ diff --git a/recipes/images/trdx-extra.inc b/recipes/images/trdx-extra.inc index c4d0555..33e9cad 100644 --- a/recipes/images/trdx-extra.inc +++ b/recipes/images/trdx-extra.inc @@ -26,7 +26,6 @@ IMAGE_INSTALL_append_tegra = " \ curl \ file \ aspell \ - eglinfo-x11 \ kernel-modules \ " @@ -66,7 +65,6 @@ IMAGE_INSTALL_append_mx6 = " \ e2fsprogs-mke2fs \ e2fsprogs-tune2fs \ mimetypes \ - eglinfo-x11 \ " #note that the kernel-modules meta package gets installed from |