From 73cfa3e16619b40ef14221d701d2f2700d6b7c28 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 7 Oct 2011 18:35:15 +0200 Subject: xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .inc (From OE-Core rev: 7c380db374381ae71cf6b1398a77654b3eebf512) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | 1 + meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc | 2 -- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'meta/recipes-graphics/xorg-xserver') 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 \ ${PN}-module-libxf1bpp \ ${PN}-module-libxf4bpp" +RDEPENDS_${PN} += "xorg-minimal-fonts" RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" RDEPENDS_${PN}-xvfb += "xkeyboard-config" 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 @@ require xserver-xorg-common.inc -RDEPENDS_${PN} += "xorg-minimal-fonts" - FILES_${PN} += "${bindir}/Xorg " 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 PROTO_DEPS += "xf86driproto dri2proto" LIB_DEPS += "virtual/libgl" -RDEPENDS_${PN} += "xorg-minimal-fonts" - FILES_${PN} += "${bindir}/Xorg " EXTRA_OECONF += "--disable-static \ -- cgit v1.2.3-54-g00ecf