[OE-core] [oe-core][PATCHv3 10/31] xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .inc

Martin Jansa martin.jansa at gmail.com
Fri Oct 7 17:05:05 UTC 2011


Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../xorg-xserver/xserver-xorg-common.inc           |    1 +
 .../xorg-xserver/xserver-xorg-lite.inc             |    2 --
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    2 --
 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 099d240..77c3761 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 a942a11..2483553 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 71754f7..6a4f978 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 \
-- 
1.7.7





More information about the Openembedded-core mailing list