diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2016-01-11 15:52:25 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-03-14 14:26:28 +0100 |
| commit | a61c71e1ffe74cb07e09db3e9a510b343e44f327 (patch) | |
| tree | d85c0dfcae88e1da7c2d5bc1ea5b2d1ba7eda0db | |
| parent | 2dcc1e20ebf00b802caf8c7d0bf973fc4a96ecc6 (diff) | |
images: cope with dropped xserver packages
Newer xserver recipes dropped some packages, move them to RRECOMMEND
rather than adding it to IMAGE_INSTALL. That way the image build
independently of the used xserver version.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | recipes/images/angstrom-lxde-image.bb | 11 | ||||
| -rw-r--r-- | recipes/images/angstrom-qt-x11-image.bb | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb index 8b8609e..256b8f8 100644 --- a/recipes/images/angstrom-lxde-image.bb +++ b/recipes/images/angstrom-lxde-image.bb @@ -176,6 +176,13 @@ IMAGE_INSTALL_append_vf = " \ xf86-video-modesetting \ " +# Packages which might be empty or no longer available +RRECOMMENDS_${PN} += " \ + xserver-xorg-multimedia-modules \ + xserver-xorg-extension-dbe \ + xserver-xorg-extension-extmod \ +" + IMAGE_INSTALL += " \ gconf \ gnome-vfs \ @@ -202,15 +209,13 @@ IMAGE_INSTALL += " \ packagegroup-base-extended \ ${XSERVER} \ xserver-common \ - xserver-xorg-extension-dbe \ - xserver-xorg-extension-extmod \ xauth \ xhost \ xset \ setxkbmap \ \ xrdb \ - xorg-minimal-fonts xserver-xorg-multimedia-modules xserver-xorg-utils \ + xorg-minimal-fonts xserver-xorg-utils \ scrot \ unclutter \ \ diff --git a/recipes/images/angstrom-qt-x11-image.bb b/recipes/images/angstrom-qt-x11-image.bb index c365762..b029dae 100644 --- a/recipes/images/angstrom-qt-x11-image.bb +++ b/recipes/images/angstrom-qt-x11-image.bb @@ -144,6 +144,9 @@ IMAGE_INSTALL_append_mx6 = " \ eglinfo-x11 \ " +# Packages which might no longer exist +RRECOMMENDS_${PN} += "xserver-xorg-multimedia-modules" + IMAGE_INSTALL += " \ ${IMAGE_INSTALL_QT4} \ \ @@ -174,7 +177,7 @@ IMAGE_INSTALL += " \ setxkbmap \ \ xrdb \ - xorg-minimal-fonts xserver-xorg-multimedia-modules xserver-xorg-utils \ + xorg-minimal-fonts xserver-xorg-utils \ scrot \ unclutter \ \ |