bash xorg packages around some more

BKrev: 414c73d1j9xj6zJW0qFcergUatVQsA

diff --git a/xserver/xserver-xorg_6.8.oe b/xserver/xserver-xorg_6.8.oe
index 399459c..11dd056 100644 (file)
--- a/xserver/xserver-xorg_6.8.oe
+++ b/xserver/xserver-xorg_6.8.oe
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "freetype libxi xmu flex-2.5.4-native"
 
@@ -7,14 +7,21 @@ SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;tag=XORG-6_8_0;m
        file://imake-staging.patch;patch=1 \
        file://dri.patch;patch=1"
 
+PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
+
 S = "${WORKDIR}/xc"
 
+FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh"
+FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
+FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
 FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
 FILES_${PN}-doc += "${libdir}/X11/doc"
 
 do_configure() {
        echo "#define BuildServersOnly YES" > config/cf/host.def
        echo "#define ProjectRoot /usr" >> config/cf/host.def
+       echo "#define XnestServer NO"  >> config/cf/host.def
+       echo "#define XdmxServer NO"  >> config/cf/host.def
        echo "#define CcCmd ${CC}" >> config/cf/host.def
        echo "#define LdCmd ${LD}" >> config/cf/host.def
        echo "" > config/cf/date.def
@@ -30,11 +37,12 @@ do_compile() {
        make includes
        make -C config/util CC="${BUILD_CC}"
        for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
-       make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"
+       make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS=""
 }
 
 do_install() {
-       make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" install
+       make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+       make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
 }
 
 do_stage() {