diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-07 18:35:15 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 18:08:33 +0100 |
| commit | 73cfa3e16619b40ef14221d701d2f2700d6b7c28 (patch) | |
| tree | 21dd8b0f7b4db04497e200d62ec71e0193f55725 /meta/recipes-graphics/xorg-xserver | |
| parent | 7350b5bad7b2e06e695d07e7c6f2f4b99374d1aa (diff) | |
| download | poky-73cfa3e16619b40ef14221d701d2f2700d6b7c28.tar.gz | |
xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .inc
(From OE-Core rev: 7c380db374381ae71cf6b1398a77654b3eebf512)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
3 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc index 099d2401b8..77c37613b5 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | |||
| @@ -60,6 +60,7 @@ PACKAGES =+ "${PN}-security-policy \ | |||
| 60 | ${PN}-module-libxf1bpp \ | 60 | ${PN}-module-libxf1bpp \ |
| 61 | ${PN}-module-libxf4bpp" | 61 | ${PN}-module-libxf4bpp" |
| 62 | 62 | ||
| 63 | RDEPENDS_${PN} += "xorg-minimal-fonts" | ||
| 63 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" | 64 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" |
| 64 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" | 65 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" |
| 65 | 66 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc index a942a115f2..2483553591 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | require xserver-xorg-common.inc | 1 | require xserver-xorg-common.inc |
| 2 | 2 | ||
| 3 | RDEPENDS_${PN} += "xorg-minimal-fonts" | ||
| 4 | |||
| 5 | FILES_${PN} += "${bindir}/Xorg " | 3 | FILES_${PN} += "${bindir}/Xorg " |
| 6 | 4 | ||
| 7 | EXTRA_OECONF += "--disable-static \ | 5 | EXTRA_OECONF += "--disable-static \ |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 71754f742b..6a4f978401 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
| @@ -3,8 +3,6 @@ require xserver-xorg-common.inc | |||
| 3 | PROTO_DEPS += "xf86driproto dri2proto" | 3 | PROTO_DEPS += "xf86driproto dri2proto" |
| 4 | LIB_DEPS += "virtual/libgl" | 4 | LIB_DEPS += "virtual/libgl" |
| 5 | 5 | ||
| 6 | RDEPENDS_${PN} += "xorg-minimal-fonts" | ||
| 7 | |||
| 8 | FILES_${PN} += "${bindir}/Xorg " | 6 | FILES_${PN} += "${bindir}/Xorg " |
| 9 | 7 | ||
| 10 | EXTRA_OECONF += "--disable-static \ | 8 | EXTRA_OECONF += "--disable-static \ |